diff options
author | Martin Možina <martin.mozina@fri.uni-lj.si> | 2017-01-16 11:55:41 +0100 |
---|---|---|
committer | Martin Možina <martin.mozina@fri.uni-lj.si> | 2017-01-16 11:55:41 +0100 |
commit | 2c1661183cb95f4558c62a9a5e89bd74763eae8d (patch) | |
tree | 279da6f3ef9de07c21539963a36f64ee25c3b23f /.gitignore | |
parent | 54b400f3b219a832e4e978e69030aeed0d99c469 (diff) | |
parent | 6eeb17d613fd652037654b3180e8dbbcc0374146 (diff) |
Merge branch 'master' of ssh://212.235.189.51:22122/aied2017
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions