Removed conflict badge when conflict is solved
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Aug 2015 09:35:04 +0000 (11:35 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Sep 2015 13:13:49 +0000 (15:13 +0200)

No differences found