Merge branch 'master' of git://github.com/tsabi/dokuwiki into pull-request-2620
commit48ad551adb00eb6e408005f94641c43e91daa0a4
authorAndreas Gohr <gohr@cosmocode.de>
Wed, 12 Dec 2018 08:47:05 +0000 (12 09:47 +0100)
committerAndreas Gohr <gohr@cosmocode.de>
Wed, 12 Dec 2018 08:47:05 +0000 (12 09:47 +0100)
tree1881f7fb8bb51c248abe5becee887bf97fd86d87
parent76e41fc593a44549bfc23f6ec927e3d8a6714725
parentf97f7cdc4026d3a9c15666b19132d13df6ba53f6
Merge branch 'master' of git://github.com/tsabi/dokuwiki into pull-request-2620

* 'master' of git://github.com/tsabi/dokuwiki:
  php7 fix
  Fix a php7 bug