Henry Jameson e06717fd0d Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences ... * upstream/develop: DM timeline: stream new statuses update-japanese-translation Add actual user search. incorporate most translation changes from MR 368 update french translation Always show dm panel. Add direct message tab. api service url On logout switch to public timeline. Put oauth text into description. Display OAuth login on login form button. Add login form back in. Linting. Re-activate registration, use oauth password flow to fetch token. Fix typo. Remove gonsole.logg :DD Fix linting. Move login to oauth.		2018-11-26 04:38:44 +03:00
..
css
font
.gitkeep
aurora_borealis.jpg
bg2.jpg
bgalt.jpg
config.json	Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences	2018-11-26 04:38:44 +03:00
emoji.json
logo.png
styles.json
terms-of-service.html
timeago-ca.json	Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text.	2018-10-16 18:11:49 +02:00
timeago-en.json
timeago-ga.json	Added Irish (Gaeilge) Language	2018-11-02 20:08:11 +00:00
timeago-ja.json
timeago-oc.json	Copy-Paste too fast from the Catalan file apparently.	2018-10-28 12:38:40 +00:00