aboutsummaryrefslogtreecommitdiff
path: root/assets/descriptor.json
diff options
context:
space:
mode:
authorKruti Shah2012-07-03 15:11:42 -0700
committerKruti Shah2012-07-03 15:11:42 -0700
commit63f1d6ddb28e4e8c4d624e764785c58666ebe5cb (patch)
tree415b48498686136a8d7656a5b836a41de21c97fb /assets/descriptor.json
parent14f30bb927f2cb4a27c81fd6ee4e8d9af46b4404 (diff)
parentfcae5717dab144c4d961b94510aed11d01568345 (diff)
downloadninja-63f1d6ddb28e4e8c4d624e764785c58666ebe5cb.tar.gz
Merge branch 'refs/heads/ninjainternalmaster' into Timeline-RefactorCode
Diffstat (limited to 'assets/descriptor.json')
0 files changed, 0 insertions, 0 deletions