Merge branch 'develop' into wikiR2

fga-eps-mds · Nov 28, 2019 · 4d99147 · 4d99147
2 parents be178a7 + 5297797
commit 4d99147
Show file tree

Hide file tree

Showing 27 changed files with 325 additions and 210 deletions.
diff --git a/dist/css/chunk-2c844006.09aee35b.css b/dist/css/chunk-2c844006.09aee35b.css
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><script src=https://aframe.io/releases/0.9.0/aframe.min.js></script><script src=https://jeromeetienne.github.io/AR.js/aframe/build/aframe-ar.js></script><script src=https://cdn.jsdelivr.net/gh/thiagolopess/aframe-gif-shader@bug/transparent-gifs/dist/aframe-gif-shader.min.js></script><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,minimum-scale=1,maximum-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel=stylesheet href="//fonts.googleapis.com/css?family=Roboto:400,500,700,400italic|Material+Icons"><title>ArBC</title><link href=/css/chunk-e9e6efa8.d12aeac7.css rel=prefetch><link href=/js/chunk-2d0e5e97.f81619ce.js rel=prefetch><link href=/js/chunk-c2e4a3e6.a12a2f69.js rel=prefetch><link href=/js/chunk-e9e6efa8.9305fa8e.js rel=prefetch><link href=/js/app.3d1b03d4.js rel=preload as=script><link href=/js/chunk-vendors.e290c677.js rel=preload as=script><link rel=icon type=image/png sizes=32x32 href=/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/img/icons/favicon-16x16.png><link rel=manifest href=/manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=2019.2-arbc><link rel=apple-touch-icon href=/img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=/img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=/img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><noscript><strong>We're sorry but 2019.2-arbc doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e290c677.js></script><script src=/js/app.3d1b03d4.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><script src=https://aframe.io/releases/0.9.0/aframe.min.js></script><script src=https://jeromeetienne.github.io/AR.js/aframe/build/aframe-ar.js></script><script src=https://cdn.jsdelivr.net/gh/thiagolopess/aframe-gif-shader@bug/transparent-gifs/dist/aframe-gif-shader.min.js></script><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,user-scalable=no,minimum-scale=1,maximum-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel=stylesheet href="//fonts.googleapis.com/css?family=Roboto:400,500,700,400italic|Material+Icons"><title>ArBC</title><link href=/css/chunk-2c844006.09aee35b.css rel=prefetch><link href=/js/chunk-2c844006.7387e497.js rel=prefetch><link href=/js/chunk-2d0e5e97.1d43811e.js rel=prefetch><link href=/js/chunk-c2e4a3e6.3ac6d4fa.js rel=prefetch><link href=/js/app.9cff49d5.js rel=preload as=script><link href=/js/chunk-vendors.605424f7.js rel=preload as=script><link rel=icon type=image/png sizes=32x32 href=/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/img/icons/favicon-16x16.png><link rel=manifest href=/manifest.json><meta name=theme-color content=#4DBA87><meta name=apple-mobile-web-app-capable content=no><meta name=apple-mobile-web-app-status-bar-style content=default><meta name=apple-mobile-web-app-title content=2019.2-arbc><link rel=apple-touch-icon href=/img/icons/apple-touch-icon-152x152.png><link rel=mask-icon href=/img/icons/safari-pinned-tab.svg color=#4DBA87><meta name=msapplication-TileImage content=/img/icons/msapplication-icon-144x144.png><meta name=msapplication-TileColor content=#000000></head><body><noscript><strong>We're sorry but 2019.2-arbc doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.605424f7.js></script><script src=/js/app.9cff49d5.js></script></body></html>
diff --git a/dist/js/app.9cff49d5.js b/dist/js/app.9cff49d5.js
diff --git a/dist/js/app.9cff49d5.js.map b/dist/js/app.9cff49d5.js.map
diff --git a/dist/js/chunk-2c844006.7387e497.js b/dist/js/chunk-2c844006.7387e497.js
diff --git a/dist/js/chunk-2c844006.7387e497.js.map b/dist/js/chunk-2c844006.7387e497.js.map
diff --git a/dist/js/chunk-2d0e5e97.1d43811e.js b/dist/js/chunk-2d0e5e97.1d43811e.js
diff --git a/dist/js/chunk-2d0e5e97.1d43811e.js.map b/dist/js/chunk-2d0e5e97.1d43811e.js.map
diff --git a/dist/js/chunk-c2e4a3e6.3ac6d4fa.js b/dist/js/chunk-c2e4a3e6.3ac6d4fa.js
diff --git a/dist/js/chunk-c2e4a3e6.3ac6d4fa.js.map b/dist/js/chunk-c2e4a3e6.3ac6d4fa.js.map