5 Commits

Author	SHA1	Message	Date
deajan	e6be72f5a8	Removed debug line	2016-08-30 19:17:14 +02:00
deajan	133e1ebe0e	Improved travis CI tests	2016-08-30 18:12:59 +02:00
deajan	a583835cf5	Added merge test	2016-08-30 16:26:30 +02:00
deajan	9daa4c10bf	Updated tests for Travis CI	2016-08-30 16:12:10 +02:00
deajan	8c17c2dfe2	Added ~ expansion	2016-08-30 15:36:08 +02:00