zeripath 5d11ccc9e1 Handle push rejection message in Merge & Web Editor (#10373) (#10497) ... Backport #10373 * Handle push rejection message in Merge * Fix sanitize, adjust message handling * Handle push-rejection in webeditor CRUD too Co-authored-by: Lauris BH <lauris@nix.lv> Co-authored-by: Lauris BH <lauris@nix.lv>		2020-02-27 15:37:11 +02:00
..
gitignore	Delete conflicting file (#9526)	2019-12-28 10:43:03 +00:00
label	Add label descriptions (#3662)	2018-03-13 10:03:55 +08:00
license	chore: update license list (#9436)	2019-12-20 08:17:25 +08:00
locale	Handle push rejection message in Merge & Web Editor (#10373) (#10497)	2020-02-27 15:37:11 +02:00
readme	Bindata is optional and over-writable on restart (#354)	2016-12-22 19:12:23 +01:00