projects / astakos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 632b645 db9083f)
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
authorOlga Brani <olgabrani@grnet.gr>
Tue, 4 Dec 2012 08:45:19 +0000 (10:45 +0200)
committerOlga Brani <olgabrani@grnet.gr>
Tue, 4 Dec 2012 08:45:19 +0000 (10:45 +0200)
Conflicts:
snf-astakos-app/astakos/im/api/__init__.py
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html

1  2 
snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html patch | diff1 | diff2 | blob | history

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