3 commits

Author	SHA1	Message	Date
Stella Rouzi	71dfb3b7e4	fix conflicts	2014-08-13 22:53:13 +03:00
Stella Rouzi	e2fb434dc7	Implement role authorization	2014-08-13 22:53:13 +03:00
Chrisbr	857ac43e74	Implements targets and campaigns for conference	2014-06-26 09:08:26 +02:00