Merge branch 'master' into staking

This commit is contained in:
Demi M. Obenour
2020-05-05 10:32:17 -04:00
3 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ format_code_in_doc_comments = false
comment_width = 80
normalize_comments = true # changed
normalize_doc_attributes = false
license_template_path = "LICENSE_TEMPLATE" # changed
license_template_path = "FILE_TEMPLATE" # changed
format_strings = false
format_macro_matchers = false
format_macro_bodies = true
View File
+1
View File
@@ -672,3 +672,4 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.