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

5
README.md
View file

@ -1,8 +1,3 @@
Important
--------
We changed the branch structure. The rails3 branch is now master. But you can safely send pull requests to rails3. It'll remain there for a couple of weeks.
FoodSoft
=========
[![Build Status](https://travis-ci.org/foodcoops/foodsoft.png?branch=tests-rspec)](https://travis-ci.org/foodcoops/foodsoft)