Skip to content

Commit d34d2e0

Browse files
hmpfhmpf
committed
Merge branch 'twig-i18n'
2 parents de69685 + aee7940 commit d34d2e0

23 files changed

Lines changed: 759 additions & 55 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,6 @@ crashlytics-build.properties
161161

162162
### Vagrant ###
163163
.vagrant/
164+
165+
### vim
166+
*.swp

‎composer.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@
3838
"simplesamlphp/saml2": "dev-master#00e38f85b417be1e10a2d738dd2f5ea82edb472c as 2.2",
3939
"robrichards/xmlseclibs": "~2.0",
4040
"whitehat101/apr1-md5": "~1.0",
41-
"twig/twig": "~1.0"
41+
"twig/twig": "~1.0",
42+
"gettext/gettext": "^3.5",
43+
"jaimeperez/twig-configurable-i18n": "^1.0"
4244
},
4345
"require-dev": {
4446
"ext-pdo_sqlite": "*",

0 commit comments

Comments
 (0)