Public Git Hosting - cds-indico.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5b710a1 a1cc392)

commit	88a55a686fb4e6c3e326cd5f269b2ea147c37adf
author	Adrian Moennich <adrian.moennich@cern.ch>
	Tue, 23 Jun 2015 10:21:03 +0000 (23 12:21 +0200)
committer	Adrian Moennich <adrian.moennich@cern.ch>
	Tue, 23 Jun 2015 10:21:03 +0000 (23 12:21 +0200)
tree	dea0612d3edff858b752908592b631ba7b71a1d4	tree \| snapshot (tar.gz zip)
parent	5b710a18753a39f2d9ffb002e55aa9d9d1f8e6d0	commit \| diff
parent	a1cc3924aafa0f6957e2e09aa3acefaf7661a82c	commit \| diff

Merge branch 'v1.9.3'

indico/MaKaC/webinterface/pages/conferences.py	diff1 \|	diff2 \|	blob \| history
indico/MaKaC/webinterface/rh/conferenceModif.py	diff1 \|	diff2 \|	blob \| history
indico/util/json.py	diff1 \|	diff2 \|	blob \| history

CDS Indico - Event management