History | View | Annotate | Download (590 Bytes)
Merge remote-tracking branch 'origin/newstyles' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/invitations.html snf-astakos-app/astakos/im/templates/im/login_base.html snf-astakos-app/astakos/im/templates/im/profile.html snf-astakos-app/astakos/im/views.py
named reverse urls
New html styles
change authentication methods: progress I
Repo refactor and webproject hooks fixes