范朋程 29082f5f01 Merge branch 'maintain/5.2'
Change-Id: Ibf45f76bffd88100a2de4ec13b5da539ea843db6

# Conflicts:
#	debian/control
#	frame/item/components/previewcontainer.cpp
#	translations/dde-dock_az.ts
2021-02-26 09:48:26 +08:00
..
2016-08-02 09:28:06 +08:00
2016-08-02 09:28:06 +08:00
2016-08-02 09:28:06 +08:00
2016-08-02 09:28:06 +08:00
2021-02-26 09:48:26 +08:00
2018-02-07 11:52:47 +08:00
2018-02-07 11:52:47 +08:00
2018-02-07 11:52:47 +08:00
2018-02-07 11:52:47 +08:00
2016-08-02 09:28:06 +08:00
2016-08-02 09:28:06 +08:00