• Show log

    Commit

  • Hash : 9de6ec52
    Author : Vicent Marti
    Date : 2014-07-23T09:41:52

    Merge pull request #2477 from ethomson/merge Don't allow conflicts by default