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

..

controllers

Javascript intl8n flavour support

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

helpers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

javascript

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

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

lib

Javascript intl8n flavour support

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

mailers

Using double splat operator (#5859)

2017-12-06 11:41:57 +01:00

models

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-07 04:17:14 +00:00

policies

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00

presenters

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-06 20:17:13 +00:00

serializers

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-07 04:17:14 +00:00

services

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-07 04:17:14 +00:00

validators

Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.

2017-11-14 17:56:38 +01:00

views

Only localize js when there's a theme

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

workers

Lists redis clean-up (#5886)

2017-12-05 23:20:27 +01:00