« Previous | Next » 

Revision 7cb372c7

ID7cb372c72500d16697f7f6f460b2c6068e574c22
Parent 76c68fd6, 6f0777d9
Child 373daf6a

Added by Sofia Papagiannaki about 9 years ago

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

Files

  • added
  • modified
  • copied
  • renamed
  • deleted