Merge branch 'master' into clostridium

* master:
  Enabling user zoom

Conflicts:
	app/index.html
This commit is contained in:
Matthew Dillon 2015-07-20 16:19:38 -08:00
commit 4d7cc5fc56

View file

@ -3,9 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>clostridiumdotinfo</title> <title>clostridium.info</title>
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no"> <meta name="viewport" content="initial-scale=1.0, maximum-scale=10.0, minimum-scale=1.0, user-scalable=yes">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes"> <meta name="apple-touch-fullscreen" content="yes">