David Yip 4f01e6e8d5 Merge remote-tracking branch 'origin/master' into gs-master		2017-10-22 22:57:41 -05:00
..
controllers	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:23:59 -05:00
helpers	Swedish translation (#5406)	2017-10-17 13:41:36 +09:00
javascript	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-22 22:57:41 -05:00
lib	hide mentions of muted accounts (in home col) (#190)	2017-10-20 10:49:54 -04: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 tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
validators	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
views	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
workers	Clean up reblog tracking keys, related improvements (#5428)	2017-10-17 11:45:06 +02:00