From f49eb8eb4ddac10617f8d08854368ea6d632df11 Mon Sep 17 00:00:00 2001
From: Jeremy Lin <jjlin@users.noreply.github.com>
Date: Wed, 12 Oct 2022 00:17:09 -0700
Subject: [PATCH 1/2] Add `CreationDate` to cipher response JSON

Upstream PR: https://github.com/bitwarden/server/pull/2142
---
 src/db/models/cipher.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/db/models/cipher.rs b/src/db/models/cipher.rs
index d5f78fbe..7464fdc1 100644
--- a/src/db/models/cipher.rs
+++ b/src/db/models/cipher.rs
@@ -160,6 +160,7 @@ impl Cipher {
             "Object": "cipherDetails",
             "Id": self.uuid,
             "Type": self.atype,
+            "CreationDate": format_date(&self.created_at),
             "RevisionDate": format_date(&self.updated_at),
             "DeletedDate": self.deleted_at.map_or(Value::Null, |d| Value::String(format_date(&d))),
             "FolderId": if let Some(cipher_sync_data) = cipher_sync_data { cipher_sync_data.cipher_folders.get(&self.uuid).map(|c| c.to_string() ) } else { self.get_folder_uuid(user_uuid, conn).await },

From fd334e2b7da8e01a591a03dae5e4d225fdd53904 Mon Sep 17 00:00:00 2001
From: Stefan Melmuk <stefan.melmuk@gmail.com>
Date: Wed, 12 Oct 2022 20:15:45 +0200
Subject: [PATCH 2/2] fix link of license badge

master branch has been renamed to main.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3e25e158..9591bbc9 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/vaultwarden/server.svg)](https://hub.docker.com/r/vaultwarden/server)
 [![Dependency Status](https://deps.rs/repo/github/dani-garcia/vaultwarden/status.svg)](https://deps.rs/repo/github/dani-garcia/vaultwarden)
 [![GitHub Release](https://img.shields.io/github/release/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/releases/latest)
-[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/master/LICENSE.txt)
+[![GPL-3.0 Licensed](https://img.shields.io/github/license/dani-garcia/vaultwarden.svg)](https://github.com/dani-garcia/vaultwarden/blob/main/LICENSE.txt)
 [![Matrix Chat](https://img.shields.io/matrix/vaultwarden:matrix.org.svg?logo=matrix)](https://matrix.to/#/#vaultwarden:matrix.org)
 
 Image is based on [Rust implementation of Bitwarden API](https://github.com/dani-garcia/vaultwarden).