]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #42 from matchab/master
authorSébastien SAUVAGE <sebsauvage@sebsauvage.net>
Mon, 11 Mar 2013 08:59:48 +0000 (01:59 -0700)
committerSébastien SAUVAGE <sebsauvage@sebsauvage.net>
Mon, 11 Mar 2013 08:59:48 +0000 (01:59 -0700)
Timezone par défaut

1  2 
index.php

diff --cc index.php
Simple merge