summaryrefslogtreecommitdiffstats
path: root/CONTRIBUTORS
diff options
context:
space:
mode:
authorDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 14:50:47 +0100
committerDaniel O'Brien <marmot.daniel@gmail.com>2013-11-13 14:50:47 +0100
commit3b47a07bac747be2be5e9f61152faa0a3d6b8044 (patch)
tree816a1f5e4100056955b67fde8c04ae72af5fe4c3 /CONTRIBUTORS
parentMerge remote-tracking branch 'origin/fixes'. (diff)
downloadcuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar.gz
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar.bz2
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar.lz
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar.xz
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.tar.zst
cuberite-3b47a07bac747be2be5e9f61152faa0a3d6b8044.zip
Diffstat (limited to '')
-rw-r--r--CONTRIBUTORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 781f973ce..cd0e60a1f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,5 +12,6 @@ rs2k
Duralex
mtilden
Luksor
+marmot
Please add yourself to this list if you contribute to MCServer.