Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	public/routes/createMessage.js
This commit is contained in:
2019-06-27 11:15:42 +02:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -112,8 +112,8 @@ const CreateMsgRouter = {
function get_insert_tag(id){
$.ajax({ url: "api/tag/"+id, method: "GET" }).done(function (tag) {
data.push("#"+tag.name);
console.log("it worked!");
data.push("#" + tag.name);
console.log("Array:"+this.data);
}).fail(function (e, f, g) {
console.log("cannot load " + id + ".json: " + e + f + g);
})