Merge branch 'api-1.2' of github.com:h5p/h5p-question-set into api-1.2

2014-10-08 14:53:57 +02:00 · 2014-10-08 14:53:57 +02:00 · 76f407182f
parent aa4c1d1035 8f85d4a5a7
commit 76f407182f
2 changed files with 2 additions and 2 deletions
--- a/language/nb.json
+++ b/language/nb.json
@ -75,7 +75,7 @@
        {
          "label": "Fremdriftstekst",
          "description": "Tekst brukt hvis tekstlig angivelse av fremdrift er valgt. Variabler: @current og @total",
-          "default": "Deloppgåve @current av @total"
+          "default": "Deloppgave @current av @total"
        }
      ]
    },
--- a/library.json
+++ b/library.json
@ -3,7 +3,7 @@
  "contentType": "question",
  "majorVersion": 1,
  "minorVersion": 0,
-  "patchVersion": 53,
+  "patchVersion": 54,
  "runnable": 1,
  "fullscreen": 0,
  "machineName": "H5P.QuestionSet",