web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reconcile differences with netflux

Browse Source
This commit is contained in:
ansuz 2016-04-21 15:44:56 +02:00
parent 565fb1d186
commit 04f6299938
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/assert/main.js
View File

@ -1,9 +1,4 @@
require.config({ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
paths: {
'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify'
}
});
define([ define([
'/bower_components/jquery/dist/jquery.min.js', '/bower_components/jquery/dist/jquery.min.js',
'/common/hyperjson.js', // serializing classes as an attribute '/common/hyperjson.js', // serializing classes as an attribute
@ -184,7 +179,7 @@ define([
var template = multiline(function () { /* var template = multiline(function () { /*
<p class="error"> <p class="error">
Failed on test number {{test}} with error message: Failed on test number {{test}} with error message:
"{{message}}" "{{message}}"
</p> </p>
<p> <p>