This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
..
controllers Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
helpers Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
javascript Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
lib Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
mailers Add ability to disable login and mark accounts as memorial (#5615) 2017-11-07 19:06:44 +01:00
models Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
policies Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
presenters Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream 2017-09-28 09:18:35 +02:00
serializers Merge tootsuite/master at 3023725936 2017-11-16 01:21:16 -06:00
services Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
validators Merge upstream 2.0ish #165 2017-10-11 10:43:10 -07:00
views Merge remote-tracking branch 'origin/master' into gs-master 2017-11-16 22:52:37 -06:00
workers Retry thread resolving (#5599) 2017-11-11 16:49:04 +01:00