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:
+1
-1
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user