Bart Visscher a4f5478d06 Merge branch 'master' into routing ...

Conflicts:
	gallery/lib/tiles.php

2012-09-28 21:43:48 +02:00

..

contacts.js

Merge branch 'master' into routing

2012-09-28 21:43:48 +02:00

expanding.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

jquery.combobox.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

jquery.Jcrop.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

jquery.Jcrop.min.js

Added files for new contact editor/viewer.

2012-02-08 08:47:03 +01:00

jquery.multi-autocomplete.js

Don't trigger unnecessary change events.

2012-04-22 00:44:53 +02:00

loader.js

Fix whitespace in contacts

2012-09-07 14:32:45 +02:00

settings.js

Edit dialog remained if you deleted an address book while editing it. oc-1657

2012-09-08 03:59:35 +02:00