Merge upstream and update Gemfile.lock

This commit is contained in:
2020-01-26 02:15:03 -05:00
parent 12bc37ec52
commit 32c6fe9764
47 changed files with 1648 additions and 194 deletions

View File

@@ -1,6 +1,6 @@
The MIT License (MIT)
Copyright (c) 2016 Dean Attali
Copyright (c) 2015-2018 Dean Attali
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
staticman integration
=================================================================================
The MIT License (MIT)
Copyright (c) 2013-2018 Michael Rose