Mackenzie Morgan 832719b01a merge from upstream dev

2016-11-29 09:37:25 -05:00

..

assets

Add a login splash

2016-11-25 09:44:12 +10:00

controllers

merge from upstream dev

2016-11-29 09:37:25 -05:00

helpers

Spacing fixes

2016-11-26 12:13:17 +13:00

mailers

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

models

merge from upstream dev

2016-11-29 09:37:25 -05:00

validators

tests back to green

2015-02-09 22:41:35 +11:00

views

rename scientific_names.scientific_name to scientific_names.name

2016-11-28 21:57:51 -05:00