diff options
| author | Martin Možina <martin.mozina@fri.uni-lj.si> | 2018-06-19 21:04:33 +0200 |
|---|---|---|
| committer | Martin Možina <martin.mozina@fri.uni-lj.si> | 2018-06-19 21:04:33 +0200 |
| commit | d59588d8d046428187135aabea5944900ffeca56 (patch) | |
| tree | f969d02a52937e4ef13199c3a9e2dd5a454e160c /.gitignore | |
| parent | 64b0ff920ea3248d467c5eb082a213204c2d01c9 (diff) | |
| parent | 72658e80a3b1a3570a4f671055939c677ff4259a (diff) | |
Merge branch 'master' of ailab.si:patterns
# Conflicts:
# aied2018/presentation/aied_poster.tex
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions