luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-26 15:16:47 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-10-09 12:12:03 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2018-10-07 19:47:56 +02:00
application.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-09-11 16:51:26 +02:00
boot.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
brakeman.ignore Add animate custom emoji param to embed pages (#8507) 2018-08-30 23:14:01 +02:00
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 Revert Font Awesome 5 upgrade (#8810) 2018-09-28 02:11:14 +02:00
puma.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
sidekiq.yml Track historical space stats in PgHero to determine PostgreSQL growth (#8906) 2018-10-09 19:35:14 +02:00
webpacker.yml Fix building assets in test environment 2018-09-13 15:32:02 +02:00