fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-16 07:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
core Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
flavours Fix detailed-status 2018-02-04 10:35:09 +09:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
locales Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
mastodon Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
packs Fix hide and show media button on admin page (#6347) 2018-01-24 13:29:46 +01:00
skins/vanilla/win95 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
styles Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00