From 1e1fc49ccd73a3831ac0c5f382dacd1ca24f7e8c Mon Sep 17 00:00:00 2001 From: checktheroads Date: Thu, 17 Jun 2021 21:56:15 -0700 Subject: [PATCH] Housekeeping --- CONTRIBUTING.md | 11 +++++++++++ LICENSE | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6c4124af..cb84717d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,3 +16,14 @@ Because I've been solo-maintaining and building hyperglass since around April 20 - **IPv6 Support** - Any new device support must include IPv6 commands - All frontend and backend code must support IPv6, both for running the application and processing queries + +## Branches + +The following are the primary branches used for development and release management: + +| Branch Name | Function | +| :---------- | :--------------------- | +| `main` | Tagged Stable Releases | +| `develop` | Ongoing Development | + +Pull requests should be made against the `develop` branch. diff --git a/LICENSE b/LICENSE index 3b4a1f5d..0e59931d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The Clear BSD License -Copyright (c) 2020 Matthew Love +Copyright (c) 2021 Matthew Love All rights reserved. Redistribution and use in source and binary forms, with or without