FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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
History
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
 		2020-07-15 15:32:40 +02:00
..
chewy
…
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
helpers
…
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
mailers
…
models Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
policies
…
presenters
…
serializers
…
services Merge branch 'master' into glitch-soc/merge-upstream 2020-07-15 15:32:40 +02:00
validators
…
views
…
workers
…