Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contents of PR #2276 without duplicated commit #2375

Merged
merged 3 commits into from
Nov 20, 2018
Merged

Contents of PR #2276 without duplicated commit #2375

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffbd591
added browse button in file properties dialog, to allow relinking of …
fschill Oct 24, 2018
427cb4c
Merge branch 'develop' into file_media_relink
DylanC Oct 28, 2018
7d50fa9
Merge branch 'fschill-file_media_relink' into testmerge
ferdnyc Nov 19, 2018
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
Next Next commit
Merge branch 'develop' into file_media_relink
  • Loading branch information
@DylanC
DylanC authored Oct 28, 2018
commit 427cb4c33a786da363d594832b9e2e391872e4c4

This merge commit was added into this branch cleanly.

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