tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/config/environments
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
..
development.rb
Add conversations API (#8832)
2018-10-07 23:44:58 +02:00
production.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-07-15 15:32:40 +02:00
test.rb
Misc. typos (#8694)
2018-09-14 00:53:09 +02:00