Skip to content

GitLab

Commit 52432161 authored by cznic's avatar cznic
Browse files

Merge branch 'master' into 'master' 

Master

See merge request !15
parents fd8a2964 14606e02
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
AUTHORS
View file @ 52432161
......@@ -8,5 +8,6 @@
#
# Please keep the list sorted.
Davsk Ltd Co <skinner.david@gmail.com>
Jan Mercl <0xjnml@gmail.com>
Steffen Butzer <steffen(dot)butzer@outlook.com>
CONTRIBUTORS
View file @ 52432161
......@@ -7,5 +7,6 @@
# Please keep the list sorted.
Alexander Menzhinsky <amenzhinsky@gmail.com>
David Skinner <skinner.david@gmail.com>
Jan Mercl <0xjnml@gmail.com>
Steffen Butzer <steffen(dot)butzer@outlook.com>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment