Mikaela/mikaela.github.io
1
0
Fork 0
mirror of https://github.com/mikaela/mikaela.github.io/ synced 2025-02-23 17:00:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge index changes from master.

Browse Source 
Why do .html files always conflict? .md files don't complain about anything.

Conflicts:
	index.html
This commit is contained in:
Mikaela Suomalainen 2012-06-09 12:00:06 +03:00
commit 0d3e164f41
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -17,8 +17,6 @@ uid Mika Suomalainen
sub 4096R/A4271AC5 2012-03-27</code></pre>
<p>Preferred keyserver: <a href="http://pool.sks-keyservers.net:11371/pks/lookup?op=get&amp;search=0x4DB53CFE82A46728">pool.sks-keyservers.net</a></p>
<p>My PGP key is also available <a href="PGP/key.txt">here</a>.</p>
<p>Please note that my key at GitHub doesn't contain any other signatures than selfsigs.</p>
<p>It has been procressed with <a href="http://pgp-tools.alioth.debian.org/">pgp-clean</a></p>
<h2 id="version-control-code-etc.">Version control / code etc.</h2>
<p><a href="https://github.com/Mkaysi">Mkaysi at GitHub</a></p>
<p><a href="https://launchpad.net/~mkaysi">Mkaysi at Launchpad</a></p>
@ -35,6 +33,6 @@ sub 4096R/A4271AC5 2012-03-27</code></pre>
<p>This mirror might be outdated unless you are looking at <a href="http://mkaysi.github.com/">http://mkaysi.github.com/</a></p>
<h2 id="official-mirrors-are-at...">Official mirrors are at...</h2>
<p>[GitHub]</p>
<p>[cadoth]</p>
<p>cadoth — Cadoth doesn't have any other address than IP right now.</p>
<p>[marduk]</p>
<p><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/3.0/88x31.png" /></a><br /><span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">mkaysi.github.com</span> by <a xmlns:cc="http://creativecommons.org/ns#" href="http://mkaysi.github.com/" property="cc:attributionName" rel="cc:attributionURL">Mika Suomalainen</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/">Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License</a>.<br />Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="http://mkaysi.github.com/" rel="dct:source">mkaysi.github.com</a>.</p>

7
index.html.md
View File

@ -34,11 +34,6 @@ Preferred keyserver: [pool.sks-keyservers.net](http://pool.sks-keyservers.net:11
My PGP key is also available [here](PGP/key.txt).
Please note that my key at GitHub doesn't contain any other signatures than selfsigs.
It has been procressed with [pgp-clean](http://pgp-tools.alioth.debian.org/)
## Version control / code etc.
[Mkaysi at GitHub](https://github.com/Mkaysi)
@ -74,7 +69,7 @@ This mirror might be outdated unless you are looking at [http://mkaysi.github.co
[GitHub]
[cadoth]
cadoth — Cadoth doesn't have any other address than IP right now.
[marduk]