]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'dev' into register
authorThomas Citharel <tcit@tcit.fr>
Fri, 13 Feb 2015 18:15:31 +0000 (19:15 +0100)
committerThomas Citharel <tcit@tcit.fr>
Fri, 13 Feb 2015 18:15:31 +0000 (19:15 +0100)
commit0eae6d14b8858005919cc3069799f77008a81d29
tree9c18566ddada5bf8e391a7fa96f27cfc71471f1b
parent1fbef3bfb57b3f73e6817115f10b5876dd0e57ef
parentdc6ec987585a1c51f678c404143e37b0d844d796
Merge branch 'dev' into register
inc/poche/Poche.class.php
inc/poche/Routing.class.php
inc/poche/config.inc.default.php