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
a942ad3062
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 Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
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 Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
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