fixed conflicts

2016-07-24 12:10:32 +02:00
parent d000f2536a 9891593413
commit 4aede6faa6
5 changed files with 141 additions and 5 deletions
--- a/1
+++ b/1
@@ -95,6 +95,7 @@ Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
 Raphael Pierzina
+Romain Dorgueil
 Roman Bolshakov
 Ronny Pfannschmidt
 Ross Lawley