Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Browse Source

Conflicts:
	js/util.min.js
	lib/default.php

...

This commit is contained in:

Shashi Gowda

2011-04-07 23:13:45 +05:30

parent 14aef781ad 5b9319d081

commit ad86eb78d3

102 changed files with 1382 additions and 496 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

2

js/util.min.js vendored

File diff suppressed because one or more lines are too long