You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2015/08/24 13:42:16 UTC
[50/50] [abbrv] incubator-taverna-databundle-viewer git commit: Merge
branch 'master' of git://git.apache.org/incubator-taverna-databundle-viewer
Merge branch 'master' of git://git.apache.org/incubator-taverna-databundle-viewer
Conflicts:
.gitignore
DISCLAIMER
Gemfile
Gemfile.lock
README.md
app/assets/javascripts/application.coffee
app/assets/stylesheets/application.scss
app/models/user.rb
app/views/devise/passwords/new.html.slim
app/views/devise/sessions/new.html.slim
app/views/layouts/application.html.slim
app/views/layouts/devise.html.slim
bin/bundle
bin/rails
bin/rake
bin/setup
bin/spring
config/initializers/assets.rb
config/routes.rb
db/schema.rb
spec/factories/users.rb
spec/feature/devise/session_spec.rb
spec/spec_helper.rb
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/b60d2b04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/b60d2b04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/b60d2b04
Branch: refs/heads/master
Commit: b60d2b04889965237d318293cfd64b0e24901878
Parents: 3260588 69110e8
Author: Denis Karyakin <sa...@gmail.com>
Authored: Fri Aug 21 19:24:33 2015 +0300
Committer: Denis Karyakin <sa...@gmail.com>
Committed: Fri Aug 21 19:24:33 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------