commit c8c9608802327b4847fd51e6a9fdc4936f9cecb7 parent e9c64f144c59eeab2f9596483de919aa76ca2a8a Author: Christian Grothoff <christian@grothoff.org> Date: Sat, 16 Jan 2016 23:58:05 +0100 Merge branch 'master' of taler.net:www Former-commit-id: 4ee67e7d95d902a063cf431b9303385064379cda Diffstat:
| A | .gitignore | | | 2 | ++ |
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -0,0 +1,2 @@ +videos/grothoff2014fossa.webm +videos/grothoff2014fossa.ogv