Merge branch 'master' into python3

Conflicts:
	.gitignore

6 files changed, 6 insertions, 6 deletions

diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index d738b455..0d30df88 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/command/cmd_ac.h b/src/command/cmd_ac.h
index 637ebcf6..79b1806c 100644
--- a/src/command/cmd_ac.h
+++ b/src/command/cmd_ac.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index a9fc3089..900e8e96 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/command/cmd_defs.h b/src/command/cmd_defs.h
index 85dee14f..3d4f3fad 100644
--- a/src/command/cmd_defs.h
+++ b/src/command/cmd_defs.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index d5f63846..c9094f18 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under
diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h
index 43731050..c91fd9c6 100644
--- a/src/command/cmd_funcs.h
+++ b/src/command/cmd_funcs.h
@@ -16,7 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
+ * along with Profanity.  If not, see <https://www.gnu.org/licenses/>.
  *
  * In addition, as a special exception, the copyright holders give permission to
  * link the code of portions of this program with the OpenSSL library under