luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 356e9150df Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
2019-06-19 18:36:16 +02:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
lib Fix rendering of emoji in public pages 2019-06-18 20:14:08 +02:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2019-06-19 18:36:16 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters
serializers Raise exception when attempting to serialize local-only statuses 2019-05-30 09:04:12 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-06-13 22:23:20 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00