summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorEkaitz Zárraga <ekaitz.zarraga@gmail.com>2016-07-10 14:47:12 +0200
committerEkaitz Zárraga <ekaitz.zarraga@gmail.com>2016-07-10 14:47:12 +0200
commitba593bfffa4f80ba5350c8f7b31a6add5f5ef4e8 (patch)
tree36da888c30be1ee592fa35a7891518c720e04895 /git
parent89b77230729f23797f4250783b84f9069aaca918 (diff)
parenta4602751fbb633244ff3aa76de4e5d0ed18000e3 (diff)
Merge remote-tracking branch 'refs/remotes/origin/master'
Diffstat (limited to 'git')
0 files changed, 0 insertions, 0 deletions