Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	composer.json
  • Loading branch information
Łukasz Serwatka committed May 29, 2018
2 parents 4b5d6d0 + 5c7b24a commit 427b9e3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -46,7 +46,7 @@
"ezsystems/ezplatform-http-cache": "~0.6@dev",
"ezsystems/ezplatform-admin-ui": "^1.1@dev",
"ezsystems/ezplatform-admin-ui-modules": "^1.1@dev",
"ezsystems/ezplatform-admin-ui-assets": "^2.0@dev",
"ezsystems/ezplatform-admin-ui-assets": "^3.0@dev",
"ezsystems/ezplatform-design-engine": "^1.2@dev",
"ezsystems/ezstudio-notifications": "^2.1@dev",
"ezsystems/date-based-publisher": "^2.2@dev",
Expand Down

0 comments on commit 427b9e3

Please sign in to comment.