Arian van Putten 79ac58a33d Solve extra merge conflicts		2015-12-20 22:41:06 +01:00
..
Servant	Solve extra merge conflicts	2015-12-20 22:41:06 +01:00
Spec.hs	remove 'hspec' call in servant-client tests	2015-10-07 17:52:23 +02:00