Skip to content

Commit

Permalink
Merge branch 'master-cwensley'
Browse files Browse the repository at this point in the history 
* master-cwensley:
  No more need for Controls.Menu.xaml to fix menus in mahapps.metro

Conflicts:
	Source/JabbR.Windows/Main.cs
  • Loading branch information
@cwensley
cwensley committed Jun 20, 2014
2 parents e8e4dc8 + c987f6a commit 5790e64
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 5790e64

Please sign in to comment.