ncls7615 a98b0a47ef Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles ...

# Conflicts:
#	app/javascript/glitch/locales/ja.json

2017-12-11 09:43:21 +09:00

..

actions

fix a missing semicolon and mixed tabs/spaces that travis was complaining about

2017-12-08 21:09:53 -06:00

components

fix a missing semicolon and mixed tabs/spaces that travis was complaining about

2017-12-08 21:09:53 -06:00

containers

Merge branch 'gs-master' into glitch-theme

2017-12-04 11:07:01 -06:00

features

remove keyboard shortcuts from getting started because thats a different thing

2017-12-09 10:32:46 -06:00

locales

Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles

2017-12-11 09:43:21 +09:00

middleware

…

packs

…

reducers

merged tootsuite pr #5811 into glitch flavour

2017-12-08 20:13:08 -06:00

selectors

…

service_worker

…

store

…

styles

merge tootsuite prs #5895 and #5889 into glitch flavour

2017-12-08 20:50:39 -06:00

util

merged tootsuite pr #5811 into glitch flavour

2017-12-08 20:13:08 -06:00

names.yml

Ruby intl8n for themes

2017-12-10 11:08:04 -08:00

theme.yml

Javascript intl8n flavour support

2017-12-10 11:08:04 -08:00