'leftie d9fba6d79d Merge branch 'master' into leftie ... # Conflicts: # src/routes/_static/themes.js		2019-06-02 13:30:33 -04:00
..
instances	feat: add home/notification filter settings (#1226)	2019-05-25 13:21:36 -07:00
about.html	fix: in about page, indicate being forked from dev branch	2019-05-27 17:09:01 -04:00
general.html	feat: add option to disable infinite scroll (#1253)	2019-05-28 22:46:01 -07:00
hotkeys.html	feat: add setting to disable hotkeys (#889)	2019-01-13 14:02:15 -08:00
index.html	feat: implement wellness settings (#1256)	2019-06-01 13:07:31 -07:00
wellness.html	feat: implement wellness settings (#1256)	2019-06-01 13:07:31 -07:00