aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources/views
diff options
context:
space:
mode:
authorAlexandr Danilov <bitbucket@modos189.ru>2015-08-10 15:25:23 +0300
committerAlexandr Danilov <bitbucket@modos189.ru>2015-08-10 15:25:23 +0300
commit0e654f62730e233f586a4efee0d654311a498b9e (patch)
tree1774492e41b73c185a62842148806af0c35e300c /app/Resources/views
parent4919584b8758b23e127536b686776c1c41b3d215 (diff)
parentf48a0189290ae6dbdb0412a3abd95acd257e55cd (diff)
downloadwallabag-0e654f62730e233f586a4efee0d654311a498b9e.tar.gz
wallabag-0e654f62730e233f586a4efee0d654311a498b9e.tar.zst
wallabag-0e654f62730e233f586a4efee0d654311a498b9e.zip
Merge remote-tracking branch 'origin/v2' into v2_fix_material
# Conflicts: # src/Wallabag/CoreBundle/Resources/views/themes/material/base.html.twig
Diffstat (limited to 'app/Resources/views')
0 files changed, 0 insertions, 0 deletions