]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
projects / github / shaarli / Shaarli.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c0e68c c6a4c28)
Merge pull request #817 from ArthurHoaro/feature/json-conf-parsing
authorArthurHoaro <arthur@hoa.ro>
Tue, 21 Mar 2017 19:04:09 +0000 (20:04 +0100)
committerGitHub <noreply@github.com>
Tue, 21 Mar 2017 19:04:09 +0000 (20:04 +0100)
Proper error if the conf file is invalid instead of fatal error


Trivial merge
The personal, minimalist, super-fast, database free, bookmarking service - community repo