Mastodon

Files

Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

2018-05-03 17:23:44 -05:00

2018-06-15 20:51:39 +02:00

2018-06-21 20:49:57 +02:00

2018-06-12 13:17:21 +00:00

application.rb

2018-05-14 20:51:50 +02:00

boot.rb

…

brakeman.ignore

…

database.yml

…

deploy.rb

2018-04-23 11:29:17 +02:00

environment.rb

…

i18n-tasks.yml

2018-05-10 00:03:34 +02:00

navigation.rb

…

puma.rb

…

routes.rb

2018-06-03 19:44:05 -05:00

secrets.yml

…

settings.yml

2018-05-18 08:47:10 -05:00

sidekiq.yml

…

webpacker.yml

…