autonomic-cooperative/autonomic.zone
Archived
5
0
Fork 0
Code Issues 15 Pull Requests 2 Releases Activity

Merge branch 'master' of gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io

Browse Source
This commit is contained in:
czmj 2017-09-29 15:30:51 +01:00
commit 67af81639e
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/_includes/cta.html
View File

@ -6,7 +6,11 @@
<p>Contact us to discuss your project's needs and arrange a consultation.</p> <p>Contact us to discuss your project's needs and arrange a consultation.</p>
</header> </header>
<ul class="actions vertical"> <ul class="actions vertical">
<<<<<<< HEAD
<li><a href="/contact" class="button fit special">Contact</a></li> <li><a href="/contact" class="button fit special">Contact</a></li>
=======
<li><a href="{{ "/contact" | relative_url }}" class="button fit special">Contact</a></li>
>>>>>>> bd276de689d553c02c023c50164b6fc165242ec8
</ul> </ul>
</div> </div>
</section> </section>

4
src/contact.md
View File

@ -7,7 +7,11 @@ title: Contact
[autonomic@posteo.net](mailto:autonomic@posteo.net) [autonomic@posteo.net](mailto:autonomic@posteo.net)
<<<<<<< HEAD
[Download PGP Key]({https://autonomic-cooperative.gitlab.io}{% link assets/pgp/autonomic-key.asc %}) [Download PGP Key]({https://autonomic-cooperative.gitlab.io}{% link assets/pgp/autonomic-key.asc %})
=======
[Download PGP Key]({{ "/assets/pgp/autonomic-key.asc" | relative_url }})
>>>>>>> bd276de689d553c02c023c50164b6fc165242ec8
Fingerprint: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147 Fingerprint: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147