summaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-09-28 21:41:21 +0200
committerBart Visscher <bartv@thisnet.nl>2012-09-28 21:41:21 +0200
commitc9317b5a68baac268e8b24a462065a5e9e3164e7 (patch)
treed695547b8901cc2070368982a12a0e6579cf255c /AUTHORS
parentbf1057143cdff8ec289d9d766ab100d64d7ea45d (diff)
parentfed34aecfa5b36c031ed754ed245549aa4a4194b (diff)
downloadnextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.tar.gz
nextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.zip
Merge branch 'master' into routing
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index b701c768d3e..2404174e328 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -17,6 +17,7 @@ ownCloud is written by:
Sam Tuke
Simon Birnbach
Lukas Reschke
+ Christian Reiner
With help from many libraries and frameworks including: