Merged master to feature/image-source

This commit is contained in:
Christoph Oberhofer
2017-05-25 21:46:37 +02:00
45 changed files with 9095 additions and 6520 deletions
+3 -1
View File
@@ -51,7 +51,9 @@
<option value="upc">UPC</option>
<option value="upc_e">UPC-E</option>
<option value="codabar">Codabar</option>
<option value="i2of5">ITF</option>
<option value="i2of5">Interleaved 2 of 5</option>
<option value="2of5">Standard 2 of 5</option>
<option value="code_93">Code 93</option>
</select>
</label>
<label>