kaniini fe906cc3f0 Merge branch 'develop' into 'notifications' ...

# Conflicts:
#   src/main.js

2018-08-24 23:00:56 +00:00

..

assets

Make nsfw image easier to understand.

2018-05-16 13:01:17 +02:00

components

Merge branch 'develop' into 'notifications'

2018-08-24 23:00:56 +00:00

i18n

Merge branch 'develop' into 'notifications'

2018-08-24 23:00:56 +00:00

lib

Clean up, use translations, persist theme, add more presets.

2017-11-18 13:13:51 +02:00

modules

Merge branch 'develop' into 'notifications'

2018-08-24 23:00:56 +00:00

services

Merge branch 'develop' into 'notifications'

2018-08-24 23:00:56 +00:00

_variables.scss

alternate usercard

2018-05-12 16:17:04 +03:00

App.js

update settings

2018-08-22 11:47:36 +09:00

App.scss

Revert "Unify button styles and use min-width"

2018-08-20 18:06:29 +00:00

App.vue

update settings

2018-08-22 11:47:36 +09:00

main.js

Merge branch 'develop' into 'notifications'

2018-08-24 23:00:56 +00:00