merge sync
authorKrista 'DarthMama' Bennett <krista@pep.foundation>
Tue, 05 May 2020 01:52:32 +0200
branchsync
changeset 4651e654f4dcf3c8
parent 4613 94ec7368085b
parent 4645 34a02edf4495
child 4652 71b962be14f2
merge
     1.1 --- a/.hgtags	Fri May 01 08:03:36 2020 +0200
     1.2 +++ b/.hgtags	Tue May 05 01:52:32 2020 +0200
     1.3 @@ -28,3 +28,4 @@
     1.4  0000000000000000000000000000000000000000 2.0.0-RC
     1.5  c4eb9bb2008fbe531f892fd56f8edce53048eb62 2.0.0-RC
     1.6  c71ec33fb34612be1d35629de5169f3489975b05 Release_2.0.0
     1.7 +b5ce496201c0e534c81d18f8447101e39762ec36 Release_2.0.1