]> source.dussan.org Git - nextcloud-server.git/commit
resolve conflicts while picking c0fb623
authorraghunayyar <me@iraghu.com>
Sun, 26 Jan 2014 15:21:29 +0000 (20:51 +0530)
committerArthur Schiwon <blizzz@owncloud.com>
Mon, 2 Jun 2014 10:52:52 +0000 (12:52 +0200)
commit0663d954e6d8170c10d444771f90210fb48f65c9
tree7a18402c7aaa13516d2efecb733231edf19cd5c4
parentf0e69b2b99174c29859729c0d91d8b4a97c6f28b
resolve conflicts while picking c0fb623
core/css/styles.css
settings/css/settings.css
settings/templates/users.php