wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/apps/shorty
History
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api 
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
..
3rdparty Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
ajax Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
appinfo Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
css Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
doc Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
img Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
js Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
l10n Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
lib Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
templates Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
.htaccess Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
index.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
preferences.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
qrcode.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
relay.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
settings.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00