merge with master: fix conflicts
authorSofia Papagiannaki <papagian@gmail.com>
Mon, 12 Mar 2012 12:13:35 +0000 (14:13 +0200)
committerSofia Papagiannaki <papagian@gmail.com>
Mon, 12 Mar 2012 12:13:35 +0000 (14:13 +0200)
commit68cb68993c22d3856a341b53bdb42ba27c364ef9
tree03d0b448e995d373097448a210bda03de4e72cd9
parent3597f9c9b195916f21721e99a29afed4a19d1fb3
merge with master: fix conflicts
.gitignore
snf-astakos-app/Changelog
snf-astakos-app/astakos/im/models.py
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
snf-astakos-app/astakos/im/static/im/less/xtra.less