]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #804 from ArthurHoaro/feature/atom-default
authorArthurHoaro <arthur@hoa.ro>
Tue, 21 Mar 2017 19:10:49 +0000 (20:10 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Mar 2017 19:10:49 +0000 (20:10 +0100)
Fixes #304: use atom feed as default

1  2 
application/config/ConfigManager.php
tpl/default/page.header.html

Simple merge
Simple merge