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 dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
 		2020-01-20 18:31:11 +01:00
..
chewy
…
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
lib
…
mailers
…
middleware
…
models Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
policies
…
presenters
…
serializers
…
services
…
validators
…
views Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00
workers
…