|
|
@@ -189,9 +189,5 @@ James Pulec, 2015/04/19
|
|
|
Alexander Lebedev, 2015/04/25
|
|
|
Frantisek Holop, 2015/05/21
|
|
|
Feanil Patel, 2015/05/21
|
|
|
-<<<<<<< HEAD
|
|
|
Juan Rossi, 2015/08/10
|
|
|
-Piotr Maślanka, 2015/08/24
|
|
|
-=======
|
|
|
-Piotr Maślanka, 2015/08/24
|
|
|
->>>>>>> origin/new-cassandra-backend
|
|
|
+Piotr Maślanka, 2015/08/24
|
Piotr Maślanka