summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-18 11:40:58 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-18 11:40:58 -0300
commitb03d0a9034534c12b2b4c48de6b614d7cea0052b (patch)
treefcabfc5dae2e834df68f685522e45ceab19956e7 /Makefile
parent3de4842c07549c59eeb7f8ab559969d31c1ff1b7 (diff)
parent7fcc4f40eaa8214de8ae20cd71d173337ad64290 (diff)
Merge remote-tracking branch 'refs/remotes/drebs/bug/5989_fix-soledad-imports' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions