luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-20 17:08:56 +00: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
images
locales
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