Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/#133-pop-out-tab' into f…
Browse files Browse the repository at this point in the history 
…eature/#133-pop-out-tab

# Conflicts:
#	src/main/java/com/faforever/client/chat/ChatController.java
  • Loading branch information
@1-alex98
1-alex98 committed Jun 13, 2017
2 parents c7567ed + cac8554 commit 2f82cfe
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2f82cfe

Please sign in to comment.