projects / astakos / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 54b8677) | patch
Resolve conflict after merge
authorSofia Papagiannaki <papagian@gmail.com>
Sun, 28 Oct 2012 15:30:22 +0000 (17:30 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Sun, 28 Oct 2012 15:30:22 +0000 (17:30 +0200)
commit9f663ff72d99fbcddf7d5f0753eb311ab859847b
tree305d8860b2d2b8d418111d76a36da8d1421eb305tree | snapshot
parent54b867759f8644b87ebe5ed731a1e100dcbe7002commit | diff
Resolve conflict after merge
snf-astakos-app/astakos/im/synnefo_settings.py diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.