aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/config.json
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2015-06-24 00:51:38 +0200
committernodiscc <nodiscc@gmail.com>2015-06-24 00:51:38 +0200
commiteaefcba724e93c5f6b426ad8855ab1af8ac8212a (patch)
tree283a94eeedbee9716cc6a43bbb8a1be4d1136916 /doc/config.json
parent9f15ca9ee76bc36832f12a952005fdaf52e2559d (diff)
parent5f85fcd863fe261921953ea3bd1742f3e1b7cf68 (diff)
downloadShaarli-eaefcba724e93c5f6b426ad8855ab1af8ac8212a.tar.gz
Shaarli-eaefcba724e93c5f6b426ad8855ab1af8ac8212a.tar.zst
Shaarli-eaefcba724e93c5f6b426ad8855ab1af8ac8212a.zip
Merge remote-tracking branch 'ArthurHoaro/input-escape' into next
Conflicts: index.php
Diffstat (limited to 'doc/config.json')
0 files changed, 0 insertions, 0 deletions