]> git.immae.eu Git - github/shaarli/Shaarli.git/commit - index.php
Fix bad merge commit
authorArthurHoaro <arthur@hoa.ro>
Thu, 12 Mar 2015 20:57:19 +0000 (21:57 +0100)
committernodiscc <nodiscc@gmail.com>
Tue, 31 Mar 2015 22:32:47 +0000 (00:32 +0200)
commita5752e776c9ee5ee5a711a76e8c8066ee88f7192
tree78041a2e030cbae5a2837109e519205dab0ab85c
parent2f4ab7cae2d3b1f13641a61c03d3b159b2c77379
Fix bad merge commit
Define date format in templates instead of index.php.

Conflicts:
index.php
tpl/dailyrss.html
index.php