luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-01 20:45:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock
2019-01-02 15:36:53 +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 2019-01-02 15:36:53 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
mailers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
workers Improve e-mail digest (#9689) 2019-01-02 10:47:32 +01:00