https://github.com/PressForward/pressforward
Tip revision: 1b179ca9ccfa9a9e38dee315c40c873f44e5bee6 authored by Aram Zucker-Scharff on 17 June 2013, 17:17:38 UTC
Merge branch '2.0.x'
Merge branch '2.0.x'
Tip revision: 1b179ca
.gitattributes
# Auto detect text files and perform LF normalization
* text=auto
# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain