Skip to content

Commit 3398d6e

Browse files
committed
Merge branch 'mysql-5.6' into mysql-5.7
2 parents af0afcc + 315ec01 commit 3398d6e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.gitattributes export-ignore
2+
.gitignore export-ignore

storage/ndb/nodejs/.bzr-mysql/default.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)