fixed merge

This commit is contained in:
Sam Keddy
2020-04-15 00:10:21 +00:00
45 changed files with 5409 additions and 4199 deletions

View File

@@ -9,4 +9,4 @@ window.onload = function(){
else
//otherwise show the new pixel dialog
showDialogue('new-pixel', false);
};
};