Fix models
Merge branch 'latest-quota' of https://code.grnet.gr/git/synnefo into latest-quota
Keep only one application in Project; the membership takes careof tracking updates. Define set_sync(); state stays PENDINGif project.application has changed in the meantime.
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into latest-quota
Change sorting
Fix migrations
Changing the name from feedback to contact in menu
global project syncer with locked trigger
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/notifications.py snf-astakos-app/astakos/im/urls.py snf-astakos-app/astakos/im/views.py
View revisions
Also available in: Atom