45

fdf
Merge branch 'master' of https://github.com/derdmitry/djcmsTimelineJS

Conflicts:
	djcmstimelinejs/db.sqlite3
	djcmstimelinejs/timeline/cms_plugins.py