]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge remote-tracking branch 'ArthurHoaro/localecharset' into next
authornodiscc <nodiscc@gmail.com>
Fri, 10 Apr 2015 18:30:15 +0000 (20:30 +0200)
committernodiscc <nodiscc@gmail.com>
Fri, 10 Apr 2015 18:30:15 +0000 (20:30 +0200)
1  2 
index.php

diff --cc index.php
Simple merge