David Yip f8e934f955 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md		2018-03-12 17:52:19 -05:00
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	2018-03-04 10:00:46 +01:00
auto_annotate_models.rake
db.rake
emojis.rake
glitchsoc.rake
mastodon.rake	Detailed SMTP setup (#6759)	2018-03-12 21:41:26 +01:00
statistics.rake