h5p-question-set/language
Frode Petterson e323c4ee3b Merge branch 'master' into unused-semantics
Conflicts:
	js/questionset.js
	language/ar.json
	language/de.json
	language/fr.json
	language/it.json
	language/nb.json
	language/nn.json
	semantics.json
	upgrades.js
2016-04-18 12:48:13 +02:00
..
ar.json Moved copyright question labels inside the common interface texts. 2016-04-15 12:49:09 +02:00
de.json Moved copyright question labels inside the common interface texts. 2016-04-15 12:49:09 +02:00
fr.json Moved copyright question labels inside the common interface texts. 2016-04-15 12:49:09 +02:00
it.json Moved copyright question labels inside the common interface texts. 2016-04-15 12:49:09 +02:00
nb.json Merge branch 'master' into unused-semantics 2016-04-18 12:48:13 +02:00
nn.json Moved copyright question labels inside the common interface texts. 2016-04-15 12:49:09 +02:00