wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
server/core
History
Brice Maron e5c56b2433 Merge branch 'master' into multi_app_dir 
Conflicts:
	lib/app.php
	lib/base.php
	lib/minimizer/css.php
	lib/minimizer/js.php
	lib/template.php
	lib/util.php
2012-06-21 17:15:35 +00:00
..
ajax restore require once command for non app files 2012-04-18 17:49:50 +02:00
css CSS class headerAction -> header-action 2012-06-18 23:22:52 +02:00
img oc-657: icons for M$ office file types 2012-05-21 09:35:31 +02:00
js Merge branch 'master' into multi_app_dir 2012-06-14 21:16:59 +00:00
l10n update translations 2012-06-06 00:29:28 +02:00
lostpassword urlencode link fort password reset (bug #970) 2012-06-13 17:22:28 +02:00
templates Merge branch 'master' into multi_app_dir 2012-06-21 17:15:35 +00:00
minimizer.php Use TemplateLayout functions for finding js and css files in minimizer 2012-06-18 15:40:48 +02:00
strings.php reuse OC_L10N objects 2012-04-14 16:44:15 +02:00