Merge branch 'devel' into new/FTL-integration

Conflicts: api.php
2024-12-06 19:36:21 +01:00 · 2017-02-28 13:49:34 +01:00
parent aacc215394 3b5578321a
commit 7a73053bfd
15 changed files with 1784 additions and 66 deletions
@@ -666,6 +666,7 @@
 			</div>
 			<div class="box-footer">
 				<input type="hidden" name="field" value="API">
+				<button type="button" class="btn btn-primary api-token">Show API token</button>
 				<button type="submit" class="btn btn-primary pull-right">Save</button>
 			</div>
 			</form>