Joseph Caudle f5c2733756 Remove merge conflict marker to fix build

2013-03-18 08:25:41 -04:00

..

controllers

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

factories

Remove merge conflict marker to fix build

2013-03-18 08:25:41 -04:00

helpers

a bit of test cleanup

2013-02-15 23:48:30 +11:00

migrations

give each user a garden. note: tests broken!

2012-11-05 14:29:04 +08:00

models

Merge branch 'restrict_usernames' into dev

2013-03-18 08:11:40 -04:00

requests

Merge branch "notifications".

2013-02-22 13:40:58 +00:00

routing

Merge branch "notifications".

2013-02-22 13:40:58 +00:00

support

limit crop wrangling to crop wranglers

2013-03-18 17:02:22 +11:00

views

Merge branch 'restrict_usernames' into dev

2013-03-18 08:11:40 -04:00

spec_helper.rb

Death to Spork! Death! Death!

2013-02-12 13:17:14 +00:00