aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2015-03-12 21:57:19 +0100
committernodiscc <nodiscc@gmail.com>2015-04-01 00:32:47 +0200
commita5752e776c9ee5ee5a711a76e8c8066ee88f7192 (patch)
tree78041a2e030cbae5a2837109e519205dab0ab85c /composer.json
parent2f4ab7cae2d3b1f13641a61c03d3b159b2c77379 (diff)
downloadShaarli-a5752e776c9ee5ee5a711a76e8c8066ee88f7192.tar.gz
Shaarli-a5752e776c9ee5ee5a711a76e8c8066ee88f7192.tar.zst
Shaarli-a5752e776c9ee5ee5a711a76e8c8066ee88f7192.zip
Fix bad merge commit
Define date format in templates instead of index.php. Conflicts: index.php tpl/dailyrss.html
Diffstat (limited to 'composer.json')
0 files changed, 0 insertions, 0 deletions