Bart Visscher
|
6b061c236d
|
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
|
2014-03-31 21:38:54 +02:00 |
Thomas Müller
|
5713b0dedb
|
Authentification -> Authentication
|
2014-03-11 16:24:50 +01:00 |
Joas Schilling
|
5b8cde48dc
|
Add button to send a test mail after changing the email settings
Fix #7175
|
2014-03-05 10:01:34 +01:00 |
|
Bart Visscher
|
8951328a87
|
More PHPDoc updates
|
2014-02-28 21:03:43 +01:00 |
|
Joas Schilling
|
9847912257
|
Remove unused variables, add doc blocks and break lines
Fix #7166
|
2014-02-26 13:10:46 +01:00 |
|
Joas Schilling
|
8387cd8ae3
|
Add option to change email settings in admin section
Fix issue #7166
|
2014-02-18 14:26:03 +01:00 |