diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-01-17 00:08:25 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-01-17 00:08:25 +0100 |
commit | 44a2852fe0894351be1e2fc41202e867a395faf4 (patch) | |
tree | 56bbc6d18ebc88a2889411b7ccbef0207ab5a45e | |
parent | 6621699a7df61b2a2761ed55368234f4451730d6 (diff) | |
parent | 51a7fd25d715540e76077bc009440988d2d43065 (diff) | |
download | www-44a2852fe0894351be1e2fc41202e867a395faf4.tar.gz www-44a2852fe0894351be1e2fc41202e867a395faf4.zip |
Merge branch 'master' of taler.net:/var/git/www
Former-commit-id: 3778c028275cc337cbdb82b72baf664d67a6061c
-rw-r--r-- | videos/grothoff2014fossa.ogv.REMOVED.git-id | 1 | ||||
-rw-r--r-- | videos/grothoff2014fossa.webm.REMOVED.git-id | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/videos/grothoff2014fossa.ogv.REMOVED.git-id b/videos/grothoff2014fossa.ogv.REMOVED.git-id new file mode 100644 index 00000000..c79e31d8 --- /dev/null +++ b/videos/grothoff2014fossa.ogv.REMOVED.git-id | |||
@@ -0,0 +1 @@ | |||
9c4c6df94e08531362034ec947a813db27ca6066 \ No newline at end of file | |||
diff --git a/videos/grothoff2014fossa.webm.REMOVED.git-id b/videos/grothoff2014fossa.webm.REMOVED.git-id new file mode 100644 index 00000000..d76c4a0c --- /dev/null +++ b/videos/grothoff2014fossa.webm.REMOVED.git-id | |||
@@ -0,0 +1 @@ | |||
7398eccda11722b00eb0ce8a5c80ed517fb061ae \ No newline at end of file | |||