diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-28 09:57:24 +0100 |
| commit | 1d44a99ebb5f00b3b9550f4c281db7519cec3c75 (patch) | |
| tree | 43a6ab3a67421bbf6589f757a97088eb16dff08b /core/templates/update.php | |
| parent | dbc13cf6ee775745c86f92d97d636f9ed3cf5432 (diff) | |
| parent | 31d83fddc482959d7fb4f7377cc7020c59c30951 (diff) | |
| download | nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.tar.gz nextcloud-server-1d44a99ebb5f00b3b9550f4c281db7519cec3c75.zip | |
Merge branch 'master' into updater-CSP
Conflicts:
core/templates/update.php
Diffstat (limited to 'core/templates/update.php')
| -rw-r--r-- | core/templates/update.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/templates/update.php b/core/templates/update.php index d4034109762..ae714dcfb92 100644 --- a/core/templates/update.php +++ b/core/templates/update.php @@ -2,4 +2,4 @@ <li class='update'> <?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br /> </li> -</ul>
\ No newline at end of file +</ul> |