diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-09-30 16:29:30 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-09-30 16:29:30 -0300 |
| commit | fb453925ff45ff37e58f41c1877c2069f4f58f89 (patch) | |
| tree | fe3275d27a13872e236bd6adb853fe0c1b10416b /Makefile | |
| parent | 66c486a534b5ecd2178e096bea3b300971f59b5b (diff) | |
| parent | decae946e725ce5275f8035e33a9d6adb69b3342 (diff) | |
Merge remote-tracking branch 'kali/feature/soledad_boostrap_error_handling' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions