Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/sequelpro/sequelpro
Browse files Browse the repository at this point in the history 
Conflicts:
	Source/SPGotoDatabaseController.m
  • Loading branch information
@dmoagx
dmoagx committed Oct 26, 2014
2 parents 68d3620 + fc506ec commit 6d48720
Show file tree
Hide file tree
Showing 5 changed files with 1,150 additions and 4,107 deletions.
Loading

0 comments on commit 6d48720

Please sign in to comment.