trustchain-oc1-orchestral
/
devicehub-teal
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
Cayo Puigdefabregas 2022-06-24 11:32:14 +02:00
parent 18e051596c cd3439b3ac
commit 1f85abc1e2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -9,6 +9,8 @@ ml).
## testing ## testing
- [changed] #302 add system uuid for check the identity of one device. - [changed] #302 add system uuid for check the identity of one device.
## [2.2.0] - 2022-06-24
- [changed] #304 change anchor of link devices lots. - [changed] #304 change anchor of link devices lots.
## [2.2.0 rc2] - 2022-06-22 ## [2.2.0 rc2] - 2022-06-22
@ -18,7 +20,6 @@ ml).
- [added] #303 Add export Lots. - [added] #303 Add export Lots.
- [added] #303 Add export relating lots with devices. - [added] #303 Add export relating lots with devices.
- [added] #303 To do possible add and remove one device in one lot transfer. - [added] #303 To do possible add and remove one device in one lot transfer.
>>>>>>> testing
## [2.2.0 rc1] - 2022-06-07 ## [2.2.0 rc1] - 2022-06-07
- [added] #212 Server side render parser Workbench Snapshots. - [added] #212 Server side render parser Workbench Snapshots.

2
ereuse_devicehub/__init__.py
View File

@ -1 +1 @@
__version__ = "2.2.0.rc1" __version__ = "2.2.0"