Merge branch 'master' of gitlab.com:autonomic-cooperative/autonomic-cooperative.gitlab.io
This commit is contained in:
commit
67af81639e
@ -6,7 +6,11 @@
|
||||
<p>Contact us to discuss your project's needs and arrange a consultation.</p>
|
||||
</header>
|
||||
<ul class="actions vertical">
|
||||
<<<<<<< HEAD
|
||||
<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>
|
||||
</div>
|
||||
</section>
|
||||
|
@ -7,7 +7,11 @@ title: Contact
|
||||
|
||||
[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]({{ "/assets/pgp/autonomic-key.asc" | relative_url }})
|
||||
>>>>>>> bd276de689d553c02c023c50164b6fc165242ec8
|
||||
|
||||
Fingerprint: 82FC 87C5 1A71 902F DC10 2CF5 4F90 D55B B24B 1147
|
||||
|
||||
|
Reference in New Issue
Block a user