Merge branch 'dev' into gardens-order

This commit is contained in:
Shiny
2017-03-15 23:09:09 +13:00
committed by GitHub
2 changed files with 3 additions and 2 deletions

View File

@@ -76,7 +76,8 @@ submit the change with your pull request.
- Brenda Wallace / [br3nda](https://github.com/br3nda)
- Jim Stallings / [jestallin](https://github.com/jestallin)
- Alyssa Ransbury / [alran](https://github.com/alran)
- Thomas Countz / [thomascountz](https://github.com/thomascountz)
## Bots
- Security and Dependency Updates / [deppbot](https://github.com/deppbot)
- Security and Dependency Updates / [deppbot](https://github.com/deppbot)

View File

@@ -111,5 +111,5 @@
- else
= link_to othergarden, garden_path(othergarden)
- if can? :create, @garden
- if @garden.owner == current_member
= link_to 'Add New Garden', new_garden_path, class: 'btn btn-default btn-xs'