Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit d71f4cc

Browse files
committed
Merge branch '3.2'
* 3.2: updated deps updated deps updated deps explicitly declare supported Twig versions updated VENDORS for 3.2.3 updated VENDORS for 2.8.17 updated VENDORS for 2.7.24 updated VENDORS for 3.2.2 updated VENDORS for 2.8.16 updated VENDORS for 2.7.23
2 parents a9c4e32 + 1480313 commit d71f4cc

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
"symfony/polyfill-apcu": "^1.0",
2222
"sensio/distribution-bundle": "^5.0",
2323
"sensio/framework-extra-bundle": "^3.0.2",
24-
"incenteev/composer-parameter-handler": "^2.0"
24+
"incenteev/composer-parameter-handler": "^2.0",
25+
"twig/twig": "^1.0||^2.0"
2526
},
2627
"require-dev": {
2728
"sensio/generator-bundle": "^3.0",

web/config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
}
271271
.sf-reset ul a,
272272
.sf-reset ul a:hover {
273-
background: url(../images/blue-arrow.png) no-repeat right 6px;
273+
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAICAYAAAAx8TU7AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFdJREFUeNpiYACBjjOhDEiACSggCKTLgXQ5TJARqhIkcReIKxgqTGYxwvV0nDEGkmeAOIwJySiQ4HsgvseIpGo3ELsCtZ9lRDIvDCiwhwHJPEFkJwEEGACq6hdnax8y1AAAAABJRU5ErkJggg==) no-repeat right 7px;
274274
padding-right: 10px;
275275
}
276276
.sf-reset ul, ol {

0 commit comments

Comments
 (0)