]> git.immae.eu Git - github/wallabag/wallabag.git/commit
projects / github / wallabag / wallabag.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4919584 f48a018)
Merge remote-tracking branch 'origin/v2' into v2_fix_material 1298/head
authorAlexandr Danilov <bitbucket@modos189.ru>
Mon, 10 Aug 2015 12:25:23 +0000 (15:25 +0300)
committerAlexandr Danilov <bitbucket@modos189.ru>
Mon, 10 Aug 2015 12:25:23 +0000 (15:25 +0300)
commit0e654f62730e233f586a4efee0d654311a498b9e
tree1774492e41b73c185a62842148806af0c35e300ctree | snapshot
parent4919584b8758b23e127536b686776c1c41b3d215commit | diff
parentf48a0189290ae6dbdb0412a3abd95acd257e55cdcommit | 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/themes/material/layout.html.twig diff1 | diff2 | blob | history
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.