You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David Yip 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb		7 years ago
..
core	…
flavours	Merge pull request #336 from ThibG/glitch-soc/features/tag-warning	7 years ago
fonts	…
images	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
locales	…
mastodon	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
packs	…
skins/vanilla/win95	…
styles	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago