Merge 7580373e62 into 8124633a39

Merge pull request #807 from daira/zip-253-stub
Add ZIP 253 stub
2024-04-23 21:42:14 -07:00 · 2024-04-23 19:23:08 +01:00 · 2024-04-23 19:08:47 +01:00 · 2024-04-18 23:09:43 +01:00 · 2024-04-14 15:50:15 +01:00 · 2023-09-08 12:53:33 +00:00
4 changed files with 35 additions and 1 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,18 @@
+# EditorConfig is awesome:http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.sh]
+indent_size = 4
+
+[*.json]
+indent_size = 2
+
+[*.css]
+indent_size = 2
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,8 @@
+###############################################################################
+# Set default behavior to automatically normalize line endings.
+###############################################################################
+* text=auto
+
+# Ensure shell scripts use LF line endings (linux only accepts LF)
+*.sh eol=lf
+*.ps1 eol=lf
--- a/zip-0253.rst
+++ b/zip-0253.rst
@ -0,0 +1,8 @@
+::
+
+  ZIP: 253
+  Title: Deployment of the NU6 Network Upgrade
+  Owners: Daira-Emma Hopwood <daira-emma@electriccoin.co>
+  Status: Reserved
+  Category: Consensus / Network
+  Discussions-To: <https://github.com/zcash/zips/issues/806>
--- a/zip-0320.rst
+++ b/zip-0320.rst
@ -5,7 +5,7 @@
  Owners: Daira-Emma Hopwood <daira@electriccoin.co>
          Kris Nuttycombe <kris@nutty.land>
  Credits: Hanh
-  Status: Draft
+  Status: Proposed
  Category: Standards / Wallet
  Created: 2024-01-12
  License: MIT
Author	SHA1	Message	Date
Andrew Arnott	84962f5c30	Merge `7580373e62` into `8124633a39`	2024-04-23 21:42:14 -07:00
Daira-Emma Hopwood	8124633a39	Merge pull request #807 from daira/zip-253-stub Add ZIP 253 stub	2024-04-23 19:23:08 +01:00
str4d	affc145506	Merge pull request #817 from daira/zip-320-to-proposed ZIP 320 to Proposed	2024-04-23 19:08:47 +01:00
Daira-Emma Hopwood	5d253b61d5	ZIP 320 to Proposed. Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>	2024-04-18 23:09:43 +01:00
Daira-Emma Hopwood	7d790904cd	Add stub for ZIP 253. Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>	2024-04-14 15:50:15 +01:00
Andrew Arnott	7580373e62	Add repo files to help maintain conventions - `.editorconfig` helps maintain whitespace rules and other things. For now, I'm just setting indenting and trailing whitespace rules. - `.gitattributes` sets checked in line ending rules. Without this file. each git client follows the rules configured by the machine that installed it. This can lead to large walls of diffs in PRs where nothing but the line endings changed. But with this file, we can constrain git in all installations to follow the line ending policies of this repo. Those policies, as I've been able to detect, are to check in LF line endings exclusively. This file ensures that policy continues to be consistently respected.	2023-09-08 12:53:33 +00:00