mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 21:43:15 -08:00
Code Issues Projects Releases Packages Wiki Activity
blueb-Chuckya-fe-standalone/app/javascript
History
David Yip eb39db7f93
 Merge remote-tracking branch 'origin/master' into gs-master 
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
..
core Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
flavours Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui 2018-03-30 14:50:02 -04: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 remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
packs Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-25 15:17:21 +00:00
skins/vanilla/win95 Ruby intl8n for themes 2017-12-10 11:08:04 -08:00
styles Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-30 19:17:17 +00:00