Merge remote-tracking branch 'origin/1.0.6_branch' into 1.0.6_branch

# Conflicts:
#	CHANGELOG.md
#	README.md
#	src/constants.js
This commit is contained in:
2019-07-28 21:13:14 -05:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
# Repertory UI MIT License #
### Copyright <2018-2019> <scott.e.graves@protonmail.com> ###
# Repertory UI MIT License
### Copyright <2018-2019> <scott.e.graves@protonmail.com>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

View File

@@ -2,7 +2,7 @@
"name": "repertory-ui",
"version": "1.0.6",
"private": true,
"author": "scott.e.graves@gmail.com",
"author": "scott.e.graves@protonmail.com",
"description": "GUI for Repertory - Repertory allows you to mount Sia and/or SiaPrime blockchain storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.",
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.19",