occheung
/
web2019
forked from M-Labs/web2019
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.m-labs.hk/M-Labs/web2019

This commit is contained in:
sovanna 2019-07-22 16:03:52 +02:00
parent da2604d954 7c60deb531
commit 7b346abb95
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/experiment-control/artiq.md
View File

@ -60,7 +60,6 @@ Technologies employed include <a href="http://python.org/" target="_blank" rel="
{{ layout_separator(separator_title="Partners") }} {{ layout_separator(separator_title="Partners") }}
@ -110,6 +109,8 @@ The first ARTIQ core devices used hardware built in-house by physicists. To impr
{% end %} {% end %}
{{ layout_centered_img(title="Grafana linked to ARTIQ, monitoring an Opticlock ion trap", src='images/grafana@2x.png', popup='images/origin/grafana.png', alt='grafana', shadow=true) }}
{% layout_logos(title="Other users and contributors") %} {% layout_logos(title="Other users and contributors") %}