]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #255 from ArthurHoaro/config
authorVirtualTam <tamisier.aurelien@gmail.com>
Thu, 9 Jul 2015 19:34:46 +0000 (21:34 +0200)
committerVirtualTam <tamisier.aurelien@gmail.com>
Thu, 9 Jul 2015 19:34:46 +0000 (21:34 +0200)
All settings are now stored in config.php

1  2 
index.php

diff --cc index.php
Simple merge