aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/default/config.twig
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2014-11-19 16:54:28 +0100
committerThomas Citharel <tcit@tcit.fr>2014-11-19 16:54:28 +0100
commite9d4d17693e2d85f1a17a29f3e82e5d0235a10ad (patch)
treea17b5939046b29742d2d54e2b28a95dc6c9e5936 /themes/default/config.twig
parentd25a3f13c2617d6d3f6d6433d426fab47727f038 (diff)
parent25f9c668348ae8d15e557bafc0e4aff2e2477e87 (diff)
downloadwallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.tar.gz
wallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.tar.zst
wallabag-e9d4d17693e2d85f1a17a29f3e82e5d0235a10ad.zip
fix merge confict
Diffstat (limited to 'themes/default/config.twig')
0 files changed, 0 insertions, 0 deletions