Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3

This commit is contained in:
benni 2012-08-27 10:08:20 +02:00
commit d3abc03e56
2 changed files with 8 additions and 3 deletions

5
README
View file

@ -6,6 +6,11 @@ Web-based software to manage a non-profit food coop (product catalog, ordering,
Have a look on README_DEVEL.
Update, it is highly recommended to checkout the rails3 branch. As soon as possible I will merge this branch
into master. So for beginnners, better start with the new (I hope much easier) code.
git checkout -b rails3 origin/rails3
== License
FoodSoft - a webbased foodcoop management software

View file

@ -69,7 +69,7 @@ With this, you also get a ready to go user with username 'admin' and password 's
---------------
Start the WEBrick server to try it out:
script/server
bundle exec rails s
(8) (optional) Get background jobs done