HJ 99b2b7a203 Merge branch 'feature/file-size-checking' into 'develop' ... [pleroma#36] Add errors when file uploading fails See merge request pleroma/pleroma-fe!405		2018-12-13 21:02:17 +00:00
..
assets	Make nsfw image easier to understand.	2018-05-16 13:01:17 +02:00
boot	Merge branch 'feature/file-size-checking' into 'develop'	2018-12-13 21:02:17 +00:00
components	Merge branch 'feature/file-size-checking' into 'develop'	2018-12-13 21:02:17 +00:00
i18n	Merge branch 'feature/file-size-checking' into 'develop'	2018-12-13 21:02:17 +00:00
lib	Merge remote-tracking branch 'upstream/develop' into feature/theming2	2018-11-26 05:21:58 +03:00
modules	keep track of new instance options	2018-12-13 20:41:01 +03:00
services	Resolve merge conflict	2018-12-13 17:22:19 +03:00
_variables.scss	checkbox radius	2018-11-23 07:28:53 +03:00
App.js	Merge remote-tracking branch 'upstream/develop' into feature/theming2	2018-11-26 05:21:58 +03:00
App.scss	Merge remote-tracking branch 'upstream/develop' into mobile-back	2018-12-13 17:50:36 +03:00
App.vue	Merge remote-tracking branch 'upstream/develop' into mobile-back	2018-12-13 17:50:36 +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