4 commits

Author	SHA1	Message	Date
Jeremy Kauffman	b8af474375	Merge branch 'master' into master	2017-06-22 08:50:36 -04:00
Alex Grintsvayg	b95f818604	ping travis	2017-06-21 15:27:40 -04:00
Alex Grintsvayg	da1314fb2c	transifex travis integration	2017-06-21 15:23:14 -04:00
Mayesters	3721500c2d	Transifex preparation	2017-06-21 20:48:04 +02:00