Revision 2bc206d4

« Previous | Next »

ID	2bc206d48b03e67bd5f02090aa8267eb993ce003
Parent	cbe40c76, 9bab44c8
Child	142f8e8f

Added by Kostas Papadimitriou almost 12 years ago

Merge branch 'master' into newstyles

Conflicts:
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
snf-astakos-app/astakos/im/templates/im/base.html
snf-astakos-app/astakos/im/templates/im/login_base.html

Files

added
modified
copied
renamed
deleted