Merge fix.

Merge branch 'develop' into feature/hash-routed
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/hash-routed
2018-02-22 11:15:31 +01:00 · 2018-02-22 10:15:56 +01:00 · 2017-11-02 17:04:52 +02:00 · 2017-08-16 15:52:28 +02:00 · 2017-06-07 10:00:01 +02:00 · 2017-06-07 09:59:56 +02:00
1 changed files with 0 additions and 1 deletions
--- a/src/main.js
+++ b/src/main.js
@ -112,7 +112,6 @@ window.fetch('/static/config.json')
    ]

    const router = new VueRouter({
-      mode: 'history',
      routes,
      scrollBehavior: (to, from, savedPosition) => {
        if (to.matched.some(m => m.meta.dontScroll)) {
Author	SHA1	Message	Date
Roger Braun	f848eaa652	Merge fix.	2018-02-22 11:15:31 +01:00
Roger Braun	519ba1fb68	Merge branch 'develop' into feature/hash-routed	2018-02-22 10:15:56 +01:00
Shpuld Shpuldson	e777592cee	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/hash-routed	2017-11-02 17:04:52 +02:00
Roger Braun	680cc493b8	Merge branch 'develop' into feature/hash-routed	2017-08-16 15:52:28 +02:00
Roger Braun	d46d7e2e06	Merge branch 'develop' into feature/hash-routed	2017-06-07 10:00:01 +02:00
Roger Braun	a6a1c7fc13	fix hash routing	2017-06-07 09:59:56 +02:00