projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bab3fc9
5416a45
)
Merge remote-tracking branch 'remotes/origin/1636-inactive-user' into 1678-new-user...
author
Peter Amstutz <tetron@cosmos>
Fri, 27 Dec 2013 01:38:22 +0000
(20:38 -0500)
committer
Peter Amstutz <tetron@cosmos>
Fri, 27 Dec 2013 01:38:22 +0000
(20:38 -0500)
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/users/home.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
doc/user/getting_started/workbench.textile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/app/views/users/home.html.erb
Simple merge
diff --cc
doc/user/getting_started/workbench.textile
Simple merge