Merge branch 'development' into serpulga/pickling-capabilities

This commit is contained in:
Patrick Kanzler 2017-08-31 08:48:17 +02:00
commit 50b2072782
No known key found for this signature in database
GPG Key ID: F07F07153306FCEF
2 changed files with 2 additions and 2 deletions

View File

@ -9,3 +9,4 @@ Renato Lorenzi <renato.lorenzi@senior.com.br> Renato.Lorenzi <renato.lore
Ahmed Tahri <nyuubi.10@gmail.com> TAHRI Ahmed <nyuubi.10@gmail.com>
Michael Elsdörfer <michael@elsdoerfer.com> Michael Elsdörfer <michael@elsdoerfer.info>
csoft2k <csoft2k@hotmail.com>
Sergio Pulgarin <sergio.pulgarin@gmail.com>

View File

@ -22,7 +22,6 @@ Qian Linfeng
Renato Lorenzi
Romain Porte
Sam Cheng
Sergio
Sergio Pulgarin
Stephan Sokolow
Thijs Triemstra