OpenSlides/openslides/core/static/js
Norman Jäckel e6dad6d087 Merge part of stable/1.5.x into master.
Conflicts:
	CHANGELOG
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/__init__.py
	openslides/core/templates/base.html
	requirements_production.txt
	tests/config/test_config.py
2014-04-08 20:33:07 +02:00
..
ckeditor Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
jquery Merge part of stable/1.5.x into master. 2014-04-08 20:33:07 +02:00
bootstrap.min.js Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
ckeditor-config.js Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
dashboard.js Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
naturalSort.js Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
utils.js Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00