diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-19 11:18:34 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-19 11:18:34 +0100 |
| commit | cce5ba991be08b4128a5e34c2b515390f77d30f7 (patch) | |
| tree | 30ae8a9138c06e2f18ff234b741ddc9a910d07ef /src/frontend_blog/articles/belarusian.jpg | |
| parent | 38bc44f67265d8ce56c6c5777097bd60c9f4337c (diff) | |
| parent | 6c15480afe13749d060331bd714ec289d32f022d (diff) | |
| download | merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.tar.gz merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.tar.bz2 merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.zip | |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
src/frontend_blog/articles/fs-essay.html
src/frontend_blog/index.html
Diffstat (limited to 'src/frontend_blog/articles/belarusian.jpg')
| -rw-r--r-- | src/frontend_blog/articles/belarusian.jpg | bin | 0 -> 9687 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/frontend_blog/articles/belarusian.jpg b/src/frontend_blog/articles/belarusian.jpg Binary files differnew file mode 100644 index 00000000..340d3756 --- /dev/null +++ b/src/frontend_blog/articles/belarusian.jpg |