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

Conflicts:
	gallery/lib/tiles.php

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

..

sabre

adding space between) and {

2012-09-07 15:21:03 +02:00

share

Update getChildren() for calendar and addressbook share backends

2012-09-08 23:11:40 -04:00

addressbook.php

adding space between) and {

2012-09-07 15:21:03 +02:00

app.php

adding space between) and {

2012-09-07 15:21:03 +02:00

hooks.php

adding space between) and {

2012-09-07 15:21:03 +02:00

search.php

Merge branch 'master' into routing

2012-09-07 15:45:35 +02:00

vcard.php

adding space between) and {

2012-09-07 15:21:03 +02:00