Adarnof 58584903bc Merge branch 'master' of https://github.com/R4stl1n/allianceauth into notification ...

Conflicts:
	celerytask/tasks.py

2016-02-17 22:33:47 +00:00

..

__init__.py

Front-end notification model

2016-02-13 05:25:57 +00:00

common_task.py

Merge branch 'master' of https://github.com/R4stl1n/allianceauth into notification

2016-02-17 22:33:47 +00:00

context_processors.py

Renamed MEDIA_URL to prevent overriding django setting

2016-01-06 20:58:17 +00:00