Skip to content

Commit 650a9af

Browse files
committed
Merge branch 'master' into basic-frontend
Conflicts: CONTRIBUTING.md LICENSE.md README.md documents/potential-models.md documents/proposed-backlog.md
2 parents c1319ee + 9f1e6e1 commit 650a9af

9 files changed

Lines changed: 20 additions & 166 deletions

CONTRIBUTING.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,14 @@ Want to contribute? Here are a few guidelines to following:
44

55
1. Create a branch that lightly defines what you are working on (e.g. adding-styles).
66
2. Once you are ready to submit a pull request, push your branch up to the repo.
7-
3. Submit your pull request against `master` branch.
7+
3. Submit your pull request against `master` branch.
8+
9+
## Public domain
10+
11+
This project is in the public domain within the United States, and
12+
copyright and related rights in the work worldwide are waived through
13+
the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
14+
15+
All contributions to this project will be released under the CC0
16+
dedication. By submitting a pull request, you are agreeing to comply
17+
with this waiver of copyright interest.

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ Unless expressly stated otherwise, the person who associated a work with
2828
this deed makes no warranties about the work, and disclaims liability for
2929
all uses of the work, to the fullest extent permitted by applicable law.
3030
When using or citing the work, you should not imply endorsement by the
31-
author or the affirmer.
31+
author or the affirmer.

README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# dotgov-dashboard
2-
A dashboard of useful information about .gov domains.
1+
## The pulse of the federal .gov webspace
2+
3+
How the .gov domain space is doing at best practices and federal requirements.
34

45
## Prerequisites
56

@@ -30,12 +31,10 @@ $ gulp
3031

3132
4) You'll now have your `.scss` files auto compile to `main.min.css` using a watch command. LiveReload is also a part of the process, but you'll need to make sure to have the [Chrome LiveReload extension](https://chrome.google.com/webstore/detail/livereload/jnihajbhpnppcggbcgedagnkighmdlei?hl=en) installed in whatever version of Chrome you are using.
3233

33-
## Public domain
34+
### Public domain
3435

35-
This project is in the public domain within the United States, and
36-
copyright and related rights in the work worldwide are waived through
37-
the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
36+
This project is in the worldwide [public domain](LICENSE.md). As stated in [CONTRIBUTING](CONTRIBUTING.md):
3837

39-
All contributions to this project will be released under the CC0
40-
dedication. By submitting a pull request, you are agreeing to comply
41-
with this waiver of copyright interest.
38+
> This project is in the public domain within the United States, and copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
39+
>
40+
> All contributions to this project will be released under the CC0 dedication. By submitting a pull request, you are agreeing to comply with this waiver of copyright interest.

documents/Brainstorming Session Notes

Lines changed: 0 additions & 19 deletions
This file was deleted.

documents/Schedule and Milestones

Lines changed: 0 additions & 13 deletions
This file was deleted.

documents/potential-models.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

documents/proposed-backlog.md

Lines changed: 0 additions & 34 deletions
This file was deleted.

documents/statement_of_need.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

documents/statement_of_work.md

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)