]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
Remove merge conflict leftover 901/head
authornodiscc <nodiscc@gmail.com>
Tue, 11 Jul 2017 12:30:14 +0000 (14:30 +0200)
committerGitHub <noreply@github.com>
Tue, 11 Jul 2017 12:30:14 +0000 (14:30 +0200)
commita5fbc689f8989ffd1181af4530a932dd0f1ed76b
tree2663ef76c35ac0124b5af0051de97b4aabeb80d1
parent70cb883547a04b3ccd3fda567d15541d124a3f41
Remove merge conflict leftover

Fixes #900
tpl/default/page.footer.html