David Yip 1253279feb

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

Conflicts:
	app/controllers/settings/two_factor_authentication/confirmations_controller.rb

2018-01-21 13:36:10 -06:00

..

core

Fixed improper mailer import

2018-01-15 21:23:26 -08:00

flavours

Merge pull request #336 from ThibG/glitch-soc/features/tag-warning

2018-01-20 16:37:52 -06:00

fonts

…

images

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

2018-01-20 10:45:43 -06:00

locales

…

mastodon

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

2018-01-21 13:36:10 -06:00

packs

Fix mailer to use webpack core

2018-01-15 21:17:03 -08:00

skins/vanilla/win95

…

styles

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

2018-01-21 13:36:10 -06:00