aboutsummaryrefslogtreecommitdiff
path: root/js/data/settings.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-22 16:26:41 -0800
committerArmen Kesablyan2012-02-22 16:26:41 -0800
commit0bd1cefea2ab350fad1a891bdc926053b799aafc (patch)
tree962f559fcc02a3dfeb297d59907e40fa153453f3 /js/data/settings.js
parent695bc5082f48dddf66ce31480a4faefc067b38bd (diff)
parent2d2b1af8b5c0d506fe6a1cf65614101fec145970 (diff)
downloadninja-0bd1cefea2ab350fad1a891bdc926053b799aafc.tar.gz
Merge branch 'refs/heads/master' into new-tool-icons
Diffstat (limited to 'js/data/settings.js')
-rwxr-xr-x[-rw-r--r--]js/data/settings.js0
1 files changed, 0 insertions, 0 deletions
diff --git a/js/data/settings.js b/js/data/settings.js
index ffea2075..ffea2075 100644..100755
--- a/js/data/settings.js
+++ b/js/data/settings.js