Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmegaDelta
2015-08-27 09:01:50 +02:00
11 changed files with 571 additions and 565 deletions

View File

@@ -347,7 +347,7 @@ nanoui is used to open and update nano browser uis
template_data_json = list2json(templates)
var/list/send_data = get_send_data(initial_data)
var/initial_data_json = replacetext(list2json_usecache(send_data), "'", "'")
var/initial_data_json = replacetext(replacetext(list2json_usecache(send_data), """, """), "'", "'")
var/url_parameters_json = list2json(list("src" = "\ref[src]"))