Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/release' into integration/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanf
seanf committed Apr 15, 2015
2 parents 5e9decd + 86d1ae0 commit c63409a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions docs/.gitattributes
View file
@@ -0,0 +1 @@
release-notes.md merge=union

0 comments on commit c63409a

Please sign in to comment.