Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/rails3'

Browse source 
Conflicts:
	Gemfile
	Gemfile.lock
This commit is contained in:
Manuel Wiedenmann 2013-06-10 01:53:31 +02:00
commit 7a63394dac
6 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -80,7 +80,7 @@ GEM
commonjs (0.2.6)
daemons (1.1.9)
erubis (2.7.0)
eventmachine (1.0.0)
eventmachine (1.0.3)
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
execjs (1.4.0)
@ -288,6 +288,7 @@ DEPENDENCIES
sqlite3
test-unit
therubyracer
thin
twitter-bootstrap-rails
uglifier (>= 1.0.3)
whenever