luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-16 07:00:57 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
2019-10-10 17:26:08 +02:00
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
webpack
application.rb Add br, es-AR, et, mk, nn to available locales (#12062) 2019-10-03 03:59:43 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb Bump capistrano from 3.11.1 to 3.11.2 (#12012) 2019-10-04 11:11:36 +09:00
environment.rb Make PreviewCard records reuseable between statuses (#4642) 2017-09-01 16:20:16 +02:00
i18n-tasks.yml
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
sidekiq.yml
webpacker.yml