Skip to content

Commit

Permalink
Merge branch 'development' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
NamelessCoder committed Jul 12, 2016
2 parents 230b925 + 7808fa1 commit 9e6e313
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"preferred-install": "dist",
"homepage": "https://fluidtypo3.org",
"license": "GPL-2.0+",
"version": "2.4.0",
"version": "3.0.0",
"autoload": {
"psr-4": {
"FluidTYPO3\\Vhs\\": "Classes/"
Expand Down
6 changes: 3 additions & 3 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
'author_email' => 'claus@namelesscoder.net',
'author_company' => '',
'shy' => '',
'dependencies' => 'cms',
'dependencies' => '',
'conflicts' => '',
'priority' => '',
'module' => '',
Expand All @@ -18,11 +18,11 @@
'modify_tables' => '',
'clearCacheOnLoad' => 0,
'lockType' => '',
'version' => '2.4.0',
'version' => '3.0.0',
'constraints' => [
'depends' => [
'php' => '5.5.0-7.0.99',
'typo3' => '7.6.0-8.1.99',
'typo3' => '7.6.0-8.2.99',
],
'conflicts' => [],
'suggests' => [],
Expand Down

0 comments on commit 9e6e313

Please sign in to comment.