Merge branch 'devel'

Serubin · May 14, 2017 · c8c95e6 · c8c95e6
2 parents 68ad619 + 0bd73a1
commit c8c95e6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -46,3 +46,4 @@ This goes under the `server` block and must be run at the root of a domain (or s
 
 ## License
 The original code is provided under the Apache 2.0 license and PulseClient is distributed under the same license as found in the LICENSE file as well as at the top of each file.
+
diff --git a/pages/nav.html b/pages/nav.html
@@ -1,4 +1,3 @@
-
  <!--
    Copyright 2017 Solomon Rubin
    Copyright 2016 Jake Klinker
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,4 @@ This goes under the `server` block and must be run at the root of a domain (or s

		## License
		The original code is provided under the Apache 2.0 license and PulseClient is distributed under the same license as found in the LICENSE file as well as at the top of each file.