Merge with master after PR zoom-level

This commit is contained in:
juliandescottes
2013-11-23 19:50:53 +01:00
27 changed files with 956 additions and 366 deletions

View File

@@ -16,6 +16,7 @@
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap.css">
<link rel="stylesheet" type="text/css" href="css/bootstrap/bootstrap-tooltip-custom.css">
<link rel="stylesheet" type="text/css" href="css/preview-film-section.css">
<link rel="stylesheet" type="text/css" href="css/minimap.css">
</head>
<body>
<script type="text/javascript" src="js/lib/iframeLoader.js"></script>