Michael Gapczynski 60feaf9abf Merge branch 'master' into share_expiration ... Conflicts: core/js/share.js lib/util.php		2012-09-12 01:06:57 -04:00
..
vcategories	Respect coding style	2012-09-04 13:21:36 +03:00
appconfig.php	adding space between) and {	2012-09-07 15:22:01 +02:00
share.php	Merge branch 'master' into share_expiration	2012-09-12 01:06:57 -04:00
translations.php	Respect coding style	2012-09-04 13:17:14 +03:00