Merge branch 'develop' into feature.issue-due-date

Browse Source

Conflicts:
	src/IDF/templates/idf/base-full.html
	src/IDF/templates/idf/base-simple.html
	src/IDF/templates/idf/base.html

...

This commit is contained in:

Simon Holywell

2012-03-30 12:20:07 +01:00

parent 3a71d71ef8 74d06b0c31

commit 315e06da1b

15 changed files with 14962 additions and 7698 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4

www/media/idf/js/jquery-1.7.1.min.js vendored

File diff suppressed because one or more lines are too long

4

www/media/idf/js/jquery-1.7.2.min.js vendored Normal file

File diff suppressed because one or more lines are too long