Manush Dodunekov 095bfa6139 Merge master & resolve conflicts

2020-01-12 18:06:10 +01: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

Merge master & resolve conflicts

2020-01-12 18:06:10 +01:00

readme

Bindata is optional and over-writable on restart (#354)

2016-12-22 19:12:23 +01:00