Commit e9857231 authored by Bilheux, Jean-Christophe's avatar Bilheux, Jean-Christophe
Browse files

Merge branch 'dev'

parents 18f02938 d9de94d5
......@@ -415,15 +415,15 @@
<ul>
<li class="" role="">
<a class="padding" href="en/github"><i class='fa fa-github'></i> Github Repos</a>
<a class="padding" href="/en/github"><i class='fa fa-github'></i> Github Repos</a>
</li>
<li class="" role="">
<a class="padding" href="en/showcase"><i class='fa fa-camera'></i> Showcases</a>
<a class="padding" href="/en/showcase"><i class='fa fa-camera'></i> Showcases</a>
</li>
<li class="" role="">
<a class="padding" href="en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
<a class="padding" href="/en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
</li>
</ul>
......@@ -856,3 +856,4 @@ and check out the items one by one.</p>
</script>
</body>
</html>
......@@ -415,15 +415,15 @@
<ul>
<li class="" role="">
<a class="padding" href="en/github"><i class='fa fa-github'></i> Github Repos</a>
<a class="padding" href="/en/github"><i class='fa fa-github'></i> Github Repos</a>
</li>
<li class="" role="">
<a class="padding" href="en/showcase"><i class='fa fa-camera'></i> Showcases</a>
<a class="padding" href="/en/showcase"><i class='fa fa-camera'></i> Showcases</a>
</li>
<li class="" role="">
<a class="padding" href="en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
<a class="padding" href="/en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
</li>
</ul>
......@@ -849,3 +849,4 @@
</script>
</body>
</html>
......@@ -415,15 +415,15 @@
<ul>
<li class="" role="">
<a class="padding" href="en/github"><i class='fa fa-github'></i> Github Repos</a>
<a class="padding" href="/en/github"><i class='fa fa-github'></i> Github Repos</a>
</li>
<li class="" role="">
<a class="padding" href="en/showcase"><i class='fa fa-camera'></i> Showcases</a>
<a class="padding" href="/en/showcase"><i class='fa fa-camera'></i> Showcases</a>
</li>
<li class="" role="">
<a class="padding" href="en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
<a class="padding" href="/en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
</li>
</ul>
......@@ -854,3 +854,4 @@ and compatible with experiment/beam line?</p>
</script>
</body>
</html>
......@@ -415,15 +415,15 @@
<ul>
<li class="" role="">
<a class="padding" href="en/github"><i class='fa fa-github'></i> Github Repos</a>
<a class="padding" href="/en/github"><i class='fa fa-github'></i> Github Repos</a>
</li>
<li class="" role="">
<a class="padding" href="en/showcase"><i class='fa fa-camera'></i> Showcases</a>
<a class="padding" href="/en/showcase"><i class='fa fa-camera'></i> Showcases</a>
</li>
<li class="" role="">
<a class="padding" href="en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
<a class="padding" href="/en/credits"><i class='fa fa-user-circle'></i> Contacts</a>
</li>
</ul>
......@@ -860,3 +860,4 @@ proceeding to the beamline.</p>
</script>
</body>
</html>
......@@ -2083,3 +2083,4 @@ Currently, it support two implementations for pages</p>
......@@ -1695,3 +1695,4 @@ proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment