diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-01-16 23:58:05 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-01-16 23:58:05 +0100 |
| commit | c8c9608802327b4847fd51e6a9fdc4936f9cecb7 (patch) | |
| tree | 56bbc6d18ebc88a2889411b7ccbef0207ab5a45e | |
| parent | e9c64f144c59eeab2f9596483de919aa76ca2a8a (diff) | |
| parent | 82b47f8c0ed1f042ed135342e39ef2fd19feba17 (diff) | |
| download | www-c8c9608802327b4847fd51e6a9fdc4936f9cecb7.tar.gz www-c8c9608802327b4847fd51e6a9fdc4936f9cecb7.zip | |
Merge branch 'master' of taler.net:www
Former-commit-id: 4ee67e7d95d902a063cf431b9303385064379cda
| -rw-r--r-- | .gitignore | 2 |
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 @@ | |||
| 1 | videos/grothoff2014fossa.webm | ||
| 2 | videos/grothoff2014fossa.ogv | ||