Skip to content
Snippets Groups Projects
Commit 3385971f authored by broman's avatar broman :speech_balloon:
Browse files

Merge branch 'master' into 'test-settings-view' 

# Conflicts:
#   Screenshottr.xcodeproj/project.pbxproj
#   Screenshottr/PomfManager.swift
parents 12fcf577 09e6e693
No related branches found
No related tags found
1 merge request!1Add settings menu, add drag and drop functionality
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment