diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-11 17:23:42 -0500 |
| commit | 58fc4756e9822d39f224a8773209e306349146e0 (patch) | |
| tree | d326c593a6b859c8344410778c9e5cd3df436ebf /AUTHORS | |
| parent | 2f35bd492629a52f4849c379f02030c1efb2495c (diff) | |
| parent | 422aaee026c57b65dda81b78b6a0f49263c6dd1e (diff) | |
Merge branch 'archweb-generic'lukeshu/netboot
# Conflicts:
# AUTHORS
# Makefile
# public/views.py
# settings.py
# templates/public/donate.html
# templates/public/download.html
# templates/public/index.html
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 26 |
1 files changed, 23 insertions, 3 deletions
@@ -1,12 +1,32 @@ -# 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> # PARABOLAWEB AUTHORS Konstantinos Karantias <kostis@gtklocker.com> |