David Yip 870d71b78b Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

..

controllers

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

helpers

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

javascript

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

lib

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

mailers

Supply @instance variable in password reset instructions / password change mailer (#5215)

2017-10-04 13:25:24 +02:00

models

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

policies

try to tighten up local only toot stuff, like... properly (#163)

2017-10-09 09:56:17 -04:00

presenters

Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream

2017-09-28 09:18:35 +02:00

serializers

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

services

Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline

2017-10-25 16:01:20 -05:00

validators

Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00

views

Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00

workers

Clean up reblog tracking keys, related improvements (#5428)

2017-10-17 11:45:06 +02:00