Skip to content

Commit 3fb0245

Browse files
committed
Merge branch 'release/0.2'
2 parents 53802d3 + 9b8818a commit 3fb0245

File tree

6 files changed

+5
-218
lines changed

6 files changed

+5
-218
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.idea

.idea/php.xml

-17
This file was deleted.

.idea/workspace.xml

-196
This file was deleted.

FFMPEGStatic.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ public static function FFPROBEPath(){
4040
return self::basePath().DIRECTORY_SEPARATOR."ffprobe";
4141
}
4242

43-
}
43+
}

composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"require": {
13-
"php": "~7.1",
13+
"php": "~7",
1414
"yiisoft/yii2": "^2.0"
1515
},
1616
"autoload": {
@@ -19,4 +19,3 @@
1919
}
2020
}
2121
}
22-

composer.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)