aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-01 16:56:38 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-01 16:56:38 -0700
commit7b695aa6847abd0dee1f36282fdcf47905756017 (patch)
treec622d94785211f4450cb508f3d5a8b823a28b252
parentd9f962ee6ff086da4c7b2d5959802397cb072ef2 (diff)
parentde4b5978c325012f225b50e69a1997c4a361ff9b (diff)
downloadvolse-hubzilla-7b695aa6847abd0dee1f36282fdcf47905756017.tar.gz
volse-hubzilla-7b695aa6847abd0dee1f36282fdcf47905756017.tar.bz2
volse-hubzilla-7b695aa6847abd0dee1f36282fdcf47905756017.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--library/cacert.pem2
-rw-r--r--library/certs/cacert.pem2
-rw-r--r--version.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/library/cacert.pem b/library/cacert.pem
index f71ec3f84..739128024 100644
--- a/library/cacert.pem
+++ b/library/cacert.pem
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Wed Apr 22 03:12:04 2015
+## Certificate data from Mozilla as of: Wed Sep 2 18:30:34 2015
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
diff --git a/library/certs/cacert.pem b/library/certs/cacert.pem
index 440e52d0a..1ff34f9b5 100644
--- a/library/certs/cacert.pem
+++ b/library/certs/cacert.pem
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Wed Apr 22 03:12:04 2015
+## Certificate data from Mozilla as of: Wed Sep 2 18:30:34 2015
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
diff --git a/version.inc b/version.inc
index d3462488c..e3915d929 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-30.1171
+2015-10-01.1172