summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-01-31 11:37:45 -0400
committerKali Kaneko <kali@leap.se>2014-01-31 11:37:45 -0400
commit36e49c638cbfba25466644553009526ef87c01b8 (patch)
tree23960e1b88888e7ac2d368ffb2c78a739e877699 /Makefile
parentc43b7378164d15a40e5ad8413a463995d2d88ca4 (diff)
parent80a3983b5d3562906fcc81e8b196810d7d5a82cc (diff)
Merge remote-tracking branch 'chiiph/feature/5083_sync_soledad_only_on_account_create' into develop
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions