diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2014-05-18 10:41:54 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2014-05-18 10:41:54 +0200 |
| commit | 97f70094a07abad3fe1aaa3338a8c8f1a941c940 (patch) | |
| tree | 8d1771fd36b1df7fab960b474855c7c12b5bac1c /lib/scripts/locktimer.js | |
| parent | 272e9decc1b5a964c3303ffe8b5d52e9e08fde68 (diff) | |
| parent | 085c515a506d8b22b6cee03df82ea6872cbc6332 (diff) | |
| download | dokuwiki-97f70094a07abad3fe1aaa3338a8c8f1a941c940.tar.gz dokuwiki-97f70094a07abad3fe1aaa3338a8c8f1a941c940.zip | |
Merge branch 'master' into newcli
* master: (160 commits)
translation update
translation update
translation update
translation update
username_link should show user's name in feed too
don't treat double slashes as comments when used in string
translation update
added another test for fe5a50
update manager.dat correctly on install. closes #704
removed another case of superflous multiple cache invalidation
translation update
Issue 694: fix failing test - set filemtimes explicitly in test setup
translation update
translation update
translation update
translation update
doc block updates
fix icon for plugins following templates in extension manager
corrected german translation
added missing translation string in extension manager
...
Diffstat (limited to 'lib/scripts/locktimer.js')
0 files changed, 0 insertions, 0 deletions