]> git.immae.eu Git - github/wallabag/wallabag.git/commit
projects / github / wallabag / wallabag.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 21f78f4 f87e654)
Merge remote-tracking branch 'origin/master' into 2.3
authorJeremy Benoist <jeremy.benoist@gmail.com>
Fri, 19 May 2017 09:25:19 +0000 (11:25 +0200)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Fri, 19 May 2017 09:25:19 +0000 (11:25 +0200)
commit4ab0d25f652bdfe184046be6d50afd594709e1a9
tree0a9ea39836619df4b97d4b12bb6a0384e8c2a5eetree | snapshot
parent21f78f4d4baae7afaa5845317a9cb52e031f1d1acommit | diff
parentf87e6547e8c49a2fe4bd21ec185e99464d4d957ecommit | diff
Merge remote-tracking branch 'origin/master' into 2.3
18 files changed:
app/config/config.yml diff1 | diff2 | blob | history
composer.json diff1 | diff2 | blob | history
src/Wallabag/ApiBundle/Controller/EntryRestController.php diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml diff1 | diff2 | blob | history
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig diff1 | diff2 | blob | history
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php diff1 | diff2 | blob | history
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php diff1 | diff2 | blob | history
A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.