Commit 647dc5ec authored by Zosman's avatar Zosman
Browse files

Merge remote-tracking branch 'origin/2.2-dev' into issue85

Merging 2.2dev into issue85
parents db3c5fa9 a1dcfecf
Pipeline #678 passed with stage
in 1 minute and 27 seconds
......@@ -104,7 +104,7 @@ SRCT Go • About
Go 1.0:
<br />
<a href="">Michel Rouley</a>,
<a href="">Chris Reffet</a>,
<a href="">Chris Reffett</a>,
<a href="">Nicholas Anderson</a>,
and <a href="">Akshay Karthik</a>.
......@@ -22,6 +22,9 @@ SRCT Go &bull; My Links
<div class="newlink" style="text-align: right;">
<a href="{% url 'index' %}"><i class="fa fa-plus" aria-hidden="true"></i> Add new link</a>
<!-- show all of the links -->
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