projects
/
grml.org.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/github/pr/45'
[grml.org.git]
/
team
/
index.html.tt2
diff --git
a/team/index.html.tt2
b/team/index.html.tt2
index
e04089d
..
93f32f9
100644
(file)
--- a/
team/index.html.tt2
+++ b/
team/index.html.tt2
@@
-29,7
+29,6
@@
<h2>Grml Developers</h2>
<ul>
<h2>Grml Developers</h2>
<ul>
- <li>Alexander Wirt (formorer)</li>
<li>Darshaka Pathirana (dpat)</li>
<li>Frank Terbeck (ft)</li>
<li>Michael Prokop (mika)</li>
<li>Darshaka Pathirana (dpat)</li>
<li>Frank Terbeck (ft)</li>
<li>Michael Prokop (mika)</li>
@@
-39,6
+38,7
@@
<ul>
<li>Alexander Steinböck</li>
<ul>
<li>Alexander Steinböck</li>
+ <li>Alexander Wirt</li>
<li>Andreas Gredler</li>
<li>Chris Hofstaedtler</li>
<li>Evgeni Golov</li>
<li>Andreas Gredler</li>
<li>Chris Hofstaedtler</li>
<li>Evgeni Golov</li>