Skud 840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev ...

Conflicts:
	Gemfile.lock

2014-08-28 08:00:10 +10:00

..

assets

Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev

2014-08-25 09:30:46 +10:00

controllers

Merge remote-tracking branch 'upstream/bootstrap3' into dev

2014-08-28 08:00:10 +10:00

helpers

rails g scaffold PlantPart...

2013-10-30 23:32:20 +00:00

mailers

Move reply_link into a helper.

2013-05-01 23:45:07 +01:00

models

changed method so that you can now call crop_wranglers and admins. meta-programming ftw

2014-08-21 20:11:10 -07:00

views

Merge remote-tracking branch 'upstream/bootstrap3' into dev

2014-08-28 08:00:10 +10:00