2
0
mirror of https://github.com/tenrok/vue-form-wizard.git synced 2026-06-17 01:50:32 +03:00

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.gitattributes
This commit is contained in:
cristian.jora
2017-04-18 14:54:19 +03:00
+1 -1
View File
@@ -1,5 +1,5 @@
# Auto detect text files and perform LF normalization
*.scss linguist-language=Java
*.scss linguist-language=Vue
# Standard to msysgit
*.doc diff=astextplain