summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-11 11:42:46 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-11 11:42:46 -0300
commit48589bbdf210e11f44fdb76d7e91f6fa7e279c8e (patch)
tree4ca576ce550af32944d3beb3bffef554d57020b8 /.gitattributes
parent612a3a0964491ead998fe5ea43022fc610322b97 (diff)
parent41bae82d52a189064b09a4dded8ce5be8d7217e3 (diff)
Merge remote-tracking branch 'kali/bug/remove-icons-from-resources' into develop
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions