]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into updater-CSP
authorThomas Mueller <thomas.mueller@tmit.eu>
Mon, 28 Jan 2013 08:57:24 +0000 (09:57 +0100)
committerThomas Mueller <thomas.mueller@tmit.eu>
Mon, 28 Jan 2013 08:57:24 +0000 (09:57 +0100)
commit1d44a99ebb5f00b3b9550f4c281db7519cec3c75
tree43a6ab3a67421bbf6589f757a97088eb16dff08b
parentdbc13cf6ee775745c86f92d97d636f9ed3cf5432
parent31d83fddc482959d7fb4f7377cc7020c59c30951
Merge branch 'master' into updater-CSP

Conflicts:
core/templates/update.php
core/js/update.js
core/templates/update.php
lib/base.php