]> git.immae.eu Git - github/wallabag/wallabag.git/commit
Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 10 Sep 2013 17:22:47 +0000 (19:22 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Tue, 10 Sep 2013 17:22:47 +0000 (19:22 +0200)
commit12d9cfbcaa236a7d1aa3208a836519af1e1af8ce
tree939a744a000668327e29293826564e3a9e3d0da3
parentf3a6080fce5d0473b6452a5984a2092c97df77ec
parent964481d023676bee964141a1d14f638995ac8d30
Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr

Conflicts:
inc/3rdparty/site_config
inc/3rdparty/FlattrItem.class.php
inc/poche/Poche.class.php
inc/poche/config.inc.php
inc/poche/define.inc.php
tpl/view.twig