luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-01 19:14:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/config
History
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
..
environments Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
initializers Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
locales Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
webpack Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
application.rb Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
boot.rb
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
navigation.rb
puma.rb
routes.rb Merge branch 'master' into glitch-soc/master 2018-05-10 00:03:28 +02:00
secrets.yml
settings.yml Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
sidekiq.yml Account archive download (#6460) 2018-02-21 23:21:32 +01:00
webpacker.yml Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00