Felix Kunde c3c413f0d1 fix deletion on conflict resolution		2020-02-25 12:58:20 +01:00
..
apis/acid.zalan.do	merge with master and resolve conflicts	2020-02-25 12:30:47 +01:00
apiserver	reflect change in github url (#496)	2019-02-25 11:26:55 +01:00
cluster	merge with master and resolve conflicts	2020-02-25 12:30:47 +01:00
controller	fix deletion on conflict resolution	2020-02-25 12:58:20 +01:00
generated	update copyright in generated code (#779)	2020-01-02 17:34:49 +01:00
spec	Fix golint failures	2019-01-08 13:04:48 +01:00
util	merge with master and resolve conflicts	2020-02-25 12:30:47 +01:00