nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-07 19:05:07 -05:00
Code Activity

Merge remote-tracking branch 'origin/master' into feature/flexible-collections

Browse Source
This commit is contained in:
Thomas Rittson
2023-10-23 08:47:11 +10:00
parent 52e723c57a 728cd1c0b5
commit cd376bee7f
196 changed files with 1219 additions and 817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Models/Business/ImportedGroup.cs
View File

@ -1,9 +0,0 @@
using Bit.Core.Entities;
namespace Bit.Core.Models.Business;
public class ImportedGroup
{
public Group Group { get; set; }
public HashSet<string> ExternalUserIds { get; set; }
}

9
src/Core/Models/Data/GroupWithCollections.cs
View File

@ -1,9 +0,0 @@
using System.Data;
using Bit.Core.Entities;
namespace Bit.Core.Models.Data;
public class GroupWithCollections : Group
{
public DataTable Collections { get; set; }
}