Henry 27adde9887 Merge branch 'develop' into 'feature/accountHighlight' ... # Conflicts: # src/components/user_card_content/user_card_content.vue		2018-08-12 12:05:08 +00:00
..
assets	Make nsfw image easier to understand.	2018-05-16 13:01:17 +02:00
components	Merge branch 'develop' into 'feature/accountHighlight'	2018-08-12 12:05:08 +00:00
i18n	Merge branch 'patch-1' into 'develop'	2018-06-25 06:07:47 +00:00
lib	Clean up, use translations, persist theme, add more presets.	2017-11-18 13:13:51 +02:00
modules	cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling	2018-08-05 05:41:37 +03:00
services	cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling	2018-08-05 05:41:37 +03:00
_variables.scss	alternate usercard	2018-05-12 16:17:04 +03:00
App.js	Add who-to-follow-panel	2018-02-24 23:04:44 +09:00
App.scss	Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme	2018-08-05 09:18:04 +03:00
App.vue	merge	2018-04-22 00:48:06 +09:00
main.js	Merge branch 'develop' into 'feature/accountHighlight'	2018-08-12 12:05:08 +00:00