]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'logintimestamp' of git://github.com/owncloud/core into logintimestamp
authorArthur Schiwon <blizzz@owncloud.com>
Mon, 26 May 2014 11:56:40 +0000 (13:56 +0200)
committerArthur Schiwon <blizzz@owncloud.com>
Mon, 26 May 2014 11:56:40 +0000 (13:56 +0200)

Trivial merge