kaniini fe906cc3f0 Merge branch 'develop' into 'notifications' ... # Conflicts: # src/main.js		2018-08-24 23:00:56 +00:00
..
api.js	cleanup, updated broken favorites look + localization strings	2018-08-16 13:41:45 +03:00
chat.js	Show chat only if channel is joined.	2018-02-01 19:18:47 +02:00
config.js	Add settings for changing the visibility of replies in the timeline.	2018-08-24 20:04:26 +01:00
statuses.js	Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily"	2018-08-21 00:21:35 +03:00
users.js	Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily"	2018-08-21 00:21:35 +03:00