M6Web/BabitchClient — pull request #1 by kennydee (2013-12-14 16:09:35+00:00)
Title: change angular conflict resolution

Trying to fix Travis CI build