David Yip d9800a5647 Merge branch 'gs-master' into glitch-theme		2017-12-04 11:07:01 -06:00
..
controllers	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
helpers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
javascript	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
lib	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
mailers	Add ability to disable login and mark accounts as memorial (#5615)	2017-11-07 19:06:44 +01:00
models	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
policies	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
presenters	Merge commit 'b9f59ebcc6' into merging-upstream	2017-09-28 09:18:35 +02:00
serializers	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-25 05:17:15 +00:00
services	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-30 03:17:12 +00:00
validators	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	2017-11-14 17:56:38 +01:00
views	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
workers	Fix too many forwards (#5854)	2017-11-30 03:50:05 +01:00