aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-01-16 23:58:05 +0100
committerChristian Grothoff <christian@grothoff.org>2016-01-16 23:58:05 +0100
commit51a7fd25d715540e76077bc009440988d2d43065 (patch)
tree56bbc6d18ebc88a2889411b7ccbef0207ab5a45e
parente9c64f144c59eeab2f9596483de919aa76ca2a8a (diff)
parent82b47f8c0ed1f042ed135342e39ef2fd19feba17 (diff)
downloadwww-51a7fd25d715540e76077bc009440988d2d43065.tar.gz
www-51a7fd25d715540e76077bc009440988d2d43065.zip
Merge branch 'master' of taler.net:www
Former-commit-id: c8c9608802327b4847fd51e6a9fdc4936f9cecb7 [formerly 4ee67e7d95d902a063cf431b9303385064379cda] Former-commit-id: 963f0caab3d67f88f8fe13a41458114811fcebd0
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..3a56640b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
1videos/grothoff2014fossa.webm
2videos/grothoff2014fossa.ogv