Merge branch 'mysql-5.6' into mysql-5.7

akopytov · Dec 5, 2016 · 3398d6e · 3398d6e
2 parents af0afcc + 315ec01
commit 3398d6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore
diff --git a/storage/ndb/nodejs/.bzr-mysql/default.conf b/storage/ndb/nodejs/.bzr-mysql/default.conf
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		.gitattributes export-ignore
		.gitignore export-ignore