diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:13:02 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:13:02 -0500 |
commit | 422aaee026c57b65dda81b78b6a0f49263c6dd1e (patch) | |
tree | 6bc80bcb093ed2f0932d4469a4400ce293c94860 /AUTHORS | |
parent | 464b8d1fa572ab57d41569d45ba94b771e0a5ced (diff) | |
parent | 83eea8e167e698f8f14ea2494837510404dc75ff (diff) |
Merge branch 'archweb' into archweb-genericarchweb-generic
# Conflicts:
# templates/public/download.html
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 27 |
1 files changed, 23 insertions, 4 deletions
@@ -1,10 +1,29 @@ -# CURRENT MAINTAINER +# CURRENT MAINTAINERS +Angel Velasquez <angvp@archlinux.org> Dan McGee <dan@archlinux.org> # OTHER AUTHORS +Aaron Griffin <aaronmgriffin@gmail.com> +Andrea Scarpino <andrea@archlinux.org> +Angel Velasquez <angvp@archlinux.org> +Dan McGee <dan@archlinux.org> +Dario Giovannetti <dariogiova@gmail.com> +Dieter Plaetinck <dieter@plaetinck.be> +Dusty Phillips <dusty@archlinux.org> +Eliott <eliott@cactuswax.net> +Evangelos Foutras <evangelos@foutrelis.com> +Florian Pritz <bluewind@xinu.at> +Ismael Carnales <icarnales@gmail.com> +Jakub Klinkovský <j.l.k@gmx.com> +Jelle van der Waa <jelle@vdwaa.nl> +Johannes Löthberg <johannes@kyriasis.com> Judd Vinet <judd@archlinux.org> +Lukas Fleischer <archlinux@cryptocrack.de> +Olivier Keun <olivier.keun@gmail.com> +Pierre Schmitz <pierre@archlinux.de> +PyroPeter <abi1789@googlemail.com> +Sergej Pupykin <sergej@home.sergej.pp.ru> Simo Leone <simo@archlinux.org> -eliott <eliott@cactuswax.net> Thayer Williams <thayer@archlinux.org> -Dusty Phillips <dusty@archlinux.org> - +Thomas Bächler <thomas@archlinux.org> +Tom Willemsen <tom.willemsen@archlinux.us> |