diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-03-01 16:57:56 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-03-01 16:57:56 +0100 |
| commit | 61099c1cf22cd0476e14329468cd13c333f322f1 (patch) | |
| tree | ed967dd46b7bce1099050bf5b02d2dd19971d448 | |
| parent | 8b09564f46f9c2b3e626fe007d9684fd0b662f9f (diff) | |
| parent | dc25ab69e1c002723da3cf97d7a7bb2d89a490fb (diff) | |
| download | www-61099c1cf22cd0476e14329468cd13c333f322f1.tar.gz www-61099c1cf22cd0476e14329468cd13c333f322f1.zip | |
Merge branch 'master' of git+ssh://taler.net/var/git/www
| -rw-r--r-- | .gitmodules | 4 | ||||
| l---------[-rw-r--r--] | favicon.ico | bin | 1150 -> 28 bytes | |||
| m--------- | web-common | 0 |
3 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..f2656da2 --- /dev/null +++ b/.gitmodules | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | [submodule "web-common"] | ||
| 2 | path = web-common | ||
| 3 | url = git://taler.net/web-common | ||
| 4 | branch = master | ||
diff --git a/favicon.ico b/favicon.ico index 141b93d3..e875856e 100644..120000 --- a/favicon.ico +++ b/favicon.ico | |||
| Binary files differ | |||
diff --git a/web-common b/web-common new file mode 160000 | |||
| Subproject ffe560d347ef43f0094cde205c99eb9dd1788a6 | |||