projects / astakos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b685272 4f97595)
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
authorOlga Brani <olgabrani@grnet.gr>
Tue, 20 Nov 2012 15:40:36 +0000 (17:40 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 20 Nov 2012 15:40:36 +0000 (17:40 +0200)
Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py

Conflicts:
snf-astakos-app/astakos/im/templatetags/filters.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.