aboutsummaryrefslogtreecommitdiffhomepage
path: root/composer.json
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-03-08 00:23:10 +0100
committerThomas Citharel <tcit@tcit.fr>2015-03-08 00:23:10 +0100
commit5e10eee8fc2ccc05f511180a8c92f82de6d293b0 (patch)
tree02ec3705b7e4ff83a7c22154465b40679d25c199 /composer.json
parent8a66458ba267f01f3525cd635c912574861926fe (diff)
parent696ead7b465ca1746b7ad70994197c8a1cb26656 (diff)
downloadwallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.tar.gz
wallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.tar.zst
wallabag-5e10eee8fc2ccc05f511180a8c92f82de6d293b0.zip
Merge branch 'dev' of github.com:wallabag/wallabag into dev
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index a63f2893..f48e5dfc 100644
--- a/composer.json
+++ b/composer.json
@@ -23,8 +23,9 @@
23 "issues": "https://github.com/wallabag/wallabag/issues" 23 "issues": "https://github.com/wallabag/wallabag/issues"
24 }, 24 },
25 "require": { 25 "require": {
26 "php": ">=5.3.3",
26 "twig/twig": "1.*", 27 "twig/twig": "1.*",
27 "twig/extensions": "1.0.*", 28 "twig/extensions": "1.0.*",
28 "umpirsky/twig-gettext-extractor": "1.1.*" 29 "umpirsky/twig-gettext-extractor": "1.1.*"
29 } 30 }
30} \ No newline at end of file 31}