tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge 
Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml
2018-05-11 18:12:42 +02:00
..
core
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
flavours
Add bot badge to account headers in the WebUI
2018-05-10 00:05:08 +02:00
fonts
Theme: Windows 95
2018-01-05 16:22:58 -08:00
images
Merge branch 'master' of https://github.com/tootsuite/mastodon
2018-02-23 23:28:31 +09:00
locales
Javascript intl8n flavour support
2017-12-10 11:08:04 -08:00
mastodon
Merge branch 'master' into glitch-soc/merge
2018-05-11 18:12:42 +02:00
packs
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00
skins
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables
2018-05-06 11:32:42 -04:00
styles
Merge branch 'master' into glitch-soc/master
2018-05-10 00:03:28 +02:00