]> git.immae.eu Git - github/wallabag/wallabag.git/commit - src/Wallabag/CoreBundle/Controller/TagController.php
projects / github / wallabag / wallabag.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 946d6a5 47cadf3)
Merge remote-tracking branch 'origin/v2' into v2_fix_material
authorAlexandr Danilov <bitbucket@modos189.ru>
Mon, 10 Aug 2015 09:27:12 +0000 (12:27 +0300)
committerAlexandr Danilov <bitbucket@modos189.ru>
Mon, 10 Aug 2015 09:27:12 +0000 (12:27 +0300)
commit4919584b8758b23e127536b686776c1c41b3d215
tree80288df2d6588fd84d0d028fe0ea652131a48c9atree | snapshot
parent946d6a512470613aa5ffa556b6547397064dd89fcommit | diff
parent47cadf36c8f7c20ba1edf26e184637d33a52cf35commit | diff
Merge remote-tracking branch 'origin/v2' into v2_fix_material

# Conflicts:
# src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
src/Wallabag/CoreBundle/Resources/views/base.html.twig diff1 | diff2 | blob | history
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.