summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-09-30 16:29:30 -0300
committerTomás Touceda <chiiph@leap.se>2013-09-30 16:29:30 -0300
commitfb453925ff45ff37e58f41c1877c2069f4f58f89 (patch)
treefe3275d27a13872e236bd6adb853fe0c1b10416b /Makefile
parent66c486a534b5ecd2178e096bea3b300971f59b5b (diff)
parentdecae946e725ce5275f8035e33a9d6adb69b3342 (diff)
Merge remote-tracking branch 'kali/feature/soledad_boostrap_error_handling' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions