Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into fix_travis_timeout
  • Loading branch information
pietbrauer committed Jul 22, 2015
commit 024669980b0d4f0eabad48bb6462717ac29047e6

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.