Ignore:
Timestamp:
2016-06-22T09:47:26+02:00 (8 years ago)
Author:
Don-vip
Message:

fix #12999 - Exception after resolving conflicts (patch by michael2402, modified) - gsoc-core

File:
1 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.