~opentxs/opentxs/devel

Viewing all changes in revision 529.

  • Committer: FellowTraveler
  • Date: 2014-03-19 11:04:02 UTC
  • mfrom: (528.1.1)
  • Revision ID: git-v1:c8fd2f79a479560d8d12363bde54c552a7bfa81d
Merge pull request #69 from FellowTraveler/master

removed merge artifact.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: