Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ...

Conflicts:
	app/javascript/styles/mastodon-light.scss
	config/themes.yml

Removed config/themes.yml, took upstream's mastodon-light.scss

2018-05-25 18:59:02 +02:00

..

environments

Merge remote-tracking branch 'origin/master' into gs-master

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

initializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-18 00:17:23 +00:00

locales

Merge branch 'master' into glitch-soc/merge-master

2018-05-25 18:59:02 +02:00

webpack

Merge branch 'master' into glitch-soc/merge

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

application.rb

Merge branch 'master' into glitch-soc/merge

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

boot.rb

Upgrade Rails to version 5.2.0 (#5898)

2018-04-12 14:45:17 +02:00

brakeman.ignore

…

database.yml

…

deploy.rb

Update dependencies for Ruby (2018-04-23) (#7237)

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

environment.rb

…

i18n-tasks.yml

Ignore tootsuite-specific theme-related translation strings

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

navigation.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-09 00:17:17 +00:00

puma.rb

…

routes.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-19 22:41:10 +02:00

secrets.yml

…

settings.yml

Merge remote-tracking branch 'origin/master' into merge-upstream

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

sidekiq.yml

…

webpacker.yml

…