summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-09 18:23:17 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-09 18:23:17 +0200
commitd9cb3ec173aa798445eb5844f911f4eba5a59a05 (patch)
tree4a624f4d83eb0b7be91f268ce14170efe1c02bac
parent5dee44b0cd945f74c4e17a2a78fc53c802f2e7d0 (diff)
parent03b1d17619e7a3b2b3a4c257b0ad80476cde7df8 (diff)
Merge branch 'master' into official-master
-rw-r--r--LICENSE2
-rw-r--r--src/catlfish.erl2
-rw-r--r--src/catlfish_app.erl2
-rw-r--r--src/catlfish_sup.erl2
-rw-r--r--src/catlfish_web.erl2
-rw-r--r--src/v1.erl2
-rw-r--r--src/x509.erl2
7 files changed, 7 insertions, 7 deletions
diff --git a/LICENSE b/LICENSE
index 7085ab6..5d630b8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
Catlfish is distributed under this license:
-Copyright (c) 2014, NORDUnet A/S
+Copyright (c) 2014-2015, NORDUnet A/S
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/src/catlfish.erl b/src/catlfish.erl
index d98e741..4410203 100644
--- a/src/catlfish.erl
+++ b/src/catlfish.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(catlfish).
diff --git a/src/catlfish_app.erl b/src/catlfish_app.erl
index 56f6cc2..eef74d6 100644
--- a/src/catlfish_app.erl
+++ b/src/catlfish_app.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(catlfish_app).
diff --git a/src/catlfish_sup.erl b/src/catlfish_sup.erl
index 882a017..5da7b93 100644
--- a/src/catlfish_sup.erl
+++ b/src/catlfish_sup.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(catlfish_sup).
diff --git a/src/catlfish_web.erl b/src/catlfish_web.erl
index f9fe6d6..d49aaa1 100644
--- a/src/catlfish_web.erl
+++ b/src/catlfish_web.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(catlfish_web).
diff --git a/src/v1.erl b/src/v1.erl
index e2cadb3..29ccd41 100644
--- a/src/v1.erl
+++ b/src/v1.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
%%% @doc Certificate Transparency (RFC 6962)
diff --git a/src/x509.erl b/src/x509.erl
index 1b0db5e..544c6a7 100644
--- a/src/x509.erl
+++ b/src/x509.erl
@@ -1,4 +1,4 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
+%%% Copyright (c) 2014-2015, NORDUnet A/S.
%%% See LICENSE for licensing information.
-module(x509).