Statistics
| Branch: | Tag: | Revision:

root / snf-cyclades-app / synnefo / tools / admin.py @ 96da37c8

History | View | Annotate | Download (19.9 kB)

# Date Author Comment
c199b9eb 03/19/2012 10:35 am Christos Stavrakakis

Remove invalid import

cc875294 02/02/2012 05:10 pm Giorgos Verigakis

Merge remote-tracking branch 'origin/master' into astakos-integration

Conflicts:
runtests.sh
snf-cyclades-app/synnefo/aai/__init__.py
snf-cyclades-app/synnefo/aai/fixtures/auth_test_data.json
snf-cyclades-app/synnefo/aai/middleware.py
snf-cyclades-app/synnefo/aai/models.py...

f83c0b53 01/31/2012 09:50 am Vangelis Koukis

Merge branch 'plankton'

9c0ac5af 01/30/2012 06:55 pm Kostas Papadimitriou

Renamed snf-app to snf-cyclades-app