diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 246c669..5c1bdf1 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt | |||
| @@ -111,6 +111,7 @@ what it is today. | |||
| 111 | * Mircea Kitsune | 111 | * Mircea Kitsune |
| 112 | * mpallari | 112 | * mpallari |
| 113 | * MrMonkE | 113 | * MrMonkE |
| 114 | * Nebadon Izumi (Michael Cerquoni - http://OSgrid.org) | ||
| 114 | * nornalbion | 115 | * nornalbion |
| 115 | * Omar Vera Ustariz (IBM) | 116 | * Omar Vera Ustariz (IBM) |
| 116 | * openlifegrid.com | 117 | * openlifegrid.com |