Brenda Wallace ac6ef384e0 Merge branch 'master' into fix/notifications ...

Conflicts:
	app/views/notifications/index.html.haml

2019-07-17 09:24:04 +12:00

..

assets

Added missing semicolon in scss

2019-07-12 12:02:26 +12:00

controllers

Renaming photographings to photo associations

2019-07-13 16:13:37 +12:00

helpers

Updating likes js code

2019-07-12 09:28:45 +12:00

jobs

Application job for Rails 5

2018-01-03 17:20:08 +13:00

mailers

More locations with production email addresses

2019-01-01 13:56:08 +13:00

models

Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations

2019-07-16 12:12:16 +12:00

resources/api/v1

Delete duplicate percentage_grown attribute

2019-07-05 10:49:29 +00:00

services

Removed slug from query

2019-07-08 09:40:21 +12:00

validators

Rubocop style fix ups

2018-06-04 16:18:49 +12:00

views

Merge branch 'master' into fix/notifications

2019-07-17 09:24:04 +12:00