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

Merge branch 'master' into tests-rspec

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
wvengen 2013-09-07 01:11:24 +02:00
commit 7de57715f2
21 changed files with 2010 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -4,13 +4,6 @@ GIT
specs:
localize_input (0.1.0)
GIT
remote: git://github.com/bwalding/acts_as_configurable.git
revision: cdf6f6f979019275b523d10684b748f08e2dd8e8
specs:
acts_as_configurable (0.0.1)
rake
GIT
remote: git://github.com/technoweenie/acts_as_versioned.git
revision: 63b1fc8529d028fae632fe80ec0cb25df56cd76b
@ -310,7 +303,6 @@ PLATFORMS
ruby
DEPENDENCIES
acts_as_configurable!
acts_as_tree
acts_as_versioned!
better_errors