]> git.immae.eu Git - github/shaarli/Shaarli.git/commit
Merge remote-tracking branch 'nicolasdanelon/master' into next
authornodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 18:45:15 +0000 (20:45 +0200)
committernodiscc <nodiscc@gmail.com>
Tue, 23 Jun 2015 18:45:15 +0000 (20:45 +0200)
commit4c68c20cdd2baec36c03aa6237d2d932605b6252
treee1b5e6bbe83c81af6853622b74d49304ca9dfbb1
parentc68da3ffbfe1d73681e3d6288a7a74ef7aa8bb03
parent38eb1e7770ca87b481872f17b66fba42ea873432
Merge remote-tracking branch 'nicolasdanelon/master' into next