Roan Kattouw 6fce4c6359 Make the Resolve conflict button actually appear ... If you got an edit conflict, the save dialog would dead-end: there was no way for you to actually get to the edit conflict resolution page because we were hiding the resolve button. Bug: 69150 Change-Id: Iaccb7d0ec25d8f15398e437d614184433c33e6eb		2014-08-27 01:06:54 +00:00
..
ve-mw	Make the Resolve conflict button actually appear	2014-08-27 01:06:54 +00:00
ve-wmf/i18n	Localisation updates from https://translatewiki.net.	2014-08-20 22:35:04 +02:00