Merge branch 'stable'

pull/4/head
Frode Petterson 2016-02-19 09:39:32 +01:00
commit 8e9a2573a9
1 changed files with 3 additions and 3 deletions

View File

@ -4,7 +4,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 6, "minorVersion": 6,
"patchVersion": 2, "patchVersion": 4,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],
@ -36,7 +36,7 @@
{ {
"machineName": "FontAwesome", "machineName": "FontAwesome",
"majorVersion": 4, "majorVersion": 4,
"minorVersion": 3 "minorVersion": 5
}, },
{ {
"machineName": "H5P.Video", "machineName": "H5P.Video",