summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorailin-nemui <ailin-nemui@users.noreply.github.com>2016-01-12 23:34:44 +0100
committerailin-nemui <ailin-nemui@users.noreply.github.com>2016-01-12 23:34:44 +0100
commit38b1121989afcd1f8592e78f9fed0bc67e74814c (patch)
tree645f9373a44a843c9f57c255d38a44dbb1ec5ced /AUTHORS
parent424675f9df536eadab4e0945288ed411c7d02d00 (diff)
parentc6a85721a6e9d5a6f67f76f0062c750146c6805f (diff)
downloadirssi-38b1121989afcd1f8592e78f9fed0bc67e74814c.zip
Merge branch '0.8.18-beta1' into 0.8.18-beta2
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS3
1 files changed, 1 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index dc8e578c..7ded5017 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,7 +77,7 @@ Other patches (grep for "patch" in ChangeLog) by:
Jon Mayo
Johan Kiviniemi
JasonX
- Lukas Mai
+ Lukas Mai (mauke)
Ismael Luceno
Thomas Karpiniec
Svante Kvarnström
@@ -95,6 +95,5 @@ Other patches (grep for "patch" in ChangeLog) by:
Adam-
Robert C Jensen
Paul Johnson
- mauke
KindOne
Fabian Kurz