Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr
Conflicts: .gitignore
This commit is contained in:
commit
98dfba76c5
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,3 @@
|
|||||||
*
|
*
|
||||||
!scriptfiles/COD/
|
!scriptfiles/COD/
|
||||||
!pawno/include/anticheat/
|
!pawno/include/anticheat/
|
Loading…
Reference in New Issue
Block a user