gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #737 from ChrisBr/commercial_new

Browse source 
Simplify adding commercials to conference and event
This commit is contained in:
Christian Bruckmayer 2016-01-21 20:29:03 +01:00
commit 28e55f3f50
25 changed files with 220 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -370,6 +370,7 @@ GEM
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-oembed (0.8.14)
ruby-openid (2.5.0)
ruby-progressbar (1.5.1)
rubyzip (1.0.0)
@ -493,6 +494,7 @@ DEPENDENCIES
rspec-activemodel-mocks
rspec-rails
rubocop
ruby-oembed
sass-rails (>= 4.0.2)
shoulda-matchers
spring-commands-rspec