HJ b65ac128c1 Merge branch 'remove_favorite_hacks' into 'develop' ... no more "broken favorite" Closes #218 and #145 See merge request pleroma/pleroma-fe!431		2018-12-19 14:57:25 +00:00
..
assets	Make nsfw image easier to understand.	2018-05-16 13:01:17 +02:00
boot	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
components	Merge branch 'remove_favorite_hacks' into 'develop'	2018-12-19 14:57:25 +00:00
i18n	Merge remote-tracking branch 'upstream/develop' into async_follow	2018-12-14 17:17:58 +03:00
lib	Merge remote-tracking branch 'upstream/develop' into feature/theming2	2018-11-26 05:21:58 +03:00
modules	no more "broken favorite"	2018-12-19 01:55:53 +03:00
services	no more "broken favorite"	2018-12-19 01:55:53 +03:00
App.js	Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes	2018-12-14 17:10:26 +03:00
App.scss	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
App.vue	Feature/bigger icons for mobile / #211	2018-12-18 18:26:14 +00:00
_variables.scss	checkbox radius	2018-11-23 07:28:53 +03:00
main.js	fix old MR	2018-12-13 20:25:46 +03:00
sw.js	add checkbox to disable web push	2018-12-13 00:03:50 +07:00