Conflict resolution.

This commit is contained in:
KasparoVy
2016-09-26 12:17:35 -04:00
349 changed files with 3513 additions and 3245 deletions
+1 -1
View File
@@ -358,7 +358,7 @@ nanoui is used to open and update nano browser uis
var/list/send_data = get_send_data(initial_data)
var/initial_data_json = replacetext(replacetext(json_encode(send_data), """, """), "'", "'")
var/url_parameters_json = json_encode(list("src" = "\ref[src]"))
var/url_parameters_json = json_encode(list("src" = UID()))
return {"
<!DOCTYPE html>