fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-16 03:35:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
2018-08-17 17:43:54 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
flavours [Glitch] Defer scrollIntoView after DOM is drawn 2018-08-17 14:46:37 +02:00
fonts Theme: Windows 95 2018-01-05 16:22:58 -08:00
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales Javascript intl8n flavour support 2017-12-10 11:08:04 -08:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00
packs Fix admin.js starting rails-ujs twice (fixes #8168) (#8213) 2018-08-15 23:38:31 +02:00
skins Port Sylvhem's mastodon-light to glitch flavour 2018-05-07 17:00:02 +02:00
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-08-17 17:43:54 +02:00