mastodon/app
Ondřej Hruška 8b9ee5f16b
Merge remote-tracking branch 'upstream/master' into upstream-merge-again
2017-10-16 21:13:47 +02:00
..
controllers Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
helpers Add moderation note (#5240) 2017-10-07 20:26:43 +02:00
javascript fix some lint errors 2017-10-16 21:13:34 +02:00
lib Merge remote-tracking branch 'upstream/master' into upstream-merge-again 2017-10-16 21:13:47 +02:00
mailers Supply @instance variable in password reset instructions / password change mailer (#5215) 2017-10-04 13:25:24 +02:00
models Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -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 remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
services Merge remote-tracking branch 'origin/master' into gs-master 2017-10-16 01:29:02 -05:00
validators Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
views Merge remote-tracking branch 'upstream/master' into gs-master 2017-10-16 09:23:59 -05:00
workers Keep references to all reblogs of a status on home feed (#5419) 2017-10-16 20:44:31 +02:00