Merge branch 'master' into markdown

# Conflicts:
#	RIGS/static/css/screen.css
#	db.sqlite3
#	requirements.txt
This commit is contained in:
Tom Price
2016-03-30 23:34:33 +01:00
24 changed files with 734 additions and 9729 deletions

View File

@@ -39,7 +39,7 @@ var Konami = function (callback) {
return false;
}
}, this);
this.iphone.load(link);
/*this.iphone.load(link);*/
},
code: function (link) {
window.location = link