Merge branch 'stable' into release

pull/12/head
Paal Joergensen 2017-03-02 15:41:29 +01:00
commit a3e2329024
1 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@
"contentType": "question", "contentType": "question",
"majorVersion": 1, "majorVersion": 1,
"minorVersion": 12, "minorVersion": 12,
"patchVersion": 0, "patchVersion": 1,
"embedTypes": [ "embedTypes": [
"iframe" "iframe"
], ],