Magnus Hallin 7041efeda9 Merge branch 'drop_rustc_serialization' of https://github.com/TheServerAsterisk/juniper into TheServerAsterisk-drop_rustc_serialization ... # Conflicts: # examples/server.rs		2017-06-14 08:51:49 +02:00
..
server.rs	Merge branch 'drop_rustc_serialization' of https://github.com/TheServerAsterisk/juniper into TheServerAsterisk-drop_rustc_serialization	2017-06-14 08:51:49 +02:00