luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-08 13:37:11 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka a942ad3062 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
2018-10-29 14:00:41 +01:00
..
chewy
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:00:41 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-29 14:00:41 +01:00
mailers
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-10-28 08:37:49 +01:00
validators
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-26 20:41:43 +02:00
workers Allow inbox owner to view implicitly targeted ActivityPub payload (#9093) 2018-10-25 18:12:22 +02:00