diff options
author | Andreas Gohr <andi@splitbrain.org> | 2011-04-30 13:15:22 +0200 |
---|---|---|
committer | Michael Grosse <grosse@cosmocode.de> | 2016-04-13 11:52:54 +0200 |
commit | 34df7cb037a3bc9c3b7337a01bc8615be1b6ab8d (patch) | |
tree | 286338206db906cb213feadc212d98ae7dbce7b0 /lib/scripts/jquery/update.sh | |
parent | a297e675b310055196e041491f6f31444bc7e423 (diff) | |
download | dokuwiki-34df7cb037a3bc9c3b7337a01bc8615be1b6ab8d.tar.gz dokuwiki-34df7cb037a3bc9c3b7337a01bc8615be1b6ab8d.zip |
make merge conflict labels completely customizable
Diffstat (limited to 'lib/scripts/jquery/update.sh')
0 files changed, 0 insertions, 0 deletions