0000000000000000000000000000000000000000 1958f27061d543486308156dc9bda97e34b20052 Thomas Bocek <tom@tomp2p.net> 1401112656 +0200	
1958f27061d543486308156dc9bda97e34b20052 583b3a67cad63c8e416e654489a98421081f864d Thomas Bocek <tom@tomp2p.net> 1402062989 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
583b3a67cad63c8e416e654489a98421081f864d 29446eb40cd8ca6f2bf5825722e6006ac60cd9cd Thomas Bocek <tom@tomp2p.net> 1402401906 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
29446eb40cd8ca6f2bf5825722e6006ac60cd9cd 67ff42ef4fe92d4f5987d90ad12bad0adc6e0535 Thomas Bocek <tom@tomp2p.net> 1402482645 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
67ff42ef4fe92d4f5987d90ad12bad0adc6e0535 18a619955e0cfed667bd1633ca4279cfb3437e92 Thomas Bocek <tom@tomp2p.net> 1402903882 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
18a619955e0cfed667bd1633ca4279cfb3437e92 69196bb0116587ab2ff370545abc5062ef793ee9 Thomas Bocek <tom@tomp2p.net> 1404651047 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
69196bb0116587ab2ff370545abc5062ef793ee9 f33dd2cbd4ee6113e55b904a4ed398c09efdfbf3 Thomas Bocek <tom@tomp2p.net> 1406733722 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
f33dd2cbd4ee6113e55b904a4ed398c09efdfbf3 14dfbf4ca633e7acd57c7588f7d21ba8dc0f5eef Thomas Bocek <tom@tomp2p.net> 1408559211 +0200	commit: added manual JSON mapping
14dfbf4ca633e7acd57c7588f7d21ba8dc0f5eef 748cfd31845627796821623f5a4a685acb355a69 Thomas Bocek <tom@tomp2p.net> 1408559313 +0200	commit: merged
748cfd31845627796821623f5a4a685acb355a69 c67f60bc6da60ac969cf65818fc755d79fd94424 Thomas Bocek <tom@tomp2p.net> 1408559327 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Merge made by recursive.
c67f60bc6da60ac969cf65818fc755d79fd94424 8afc343ce7687bb56c5eae7544e35dcc7d741377 Thomas Bocek <tom@tomp2p.net> 1408559466 +0200	commit: needed to make the server compile
8afc343ce7687bb56c5eae7544e35dcc7d741377 ec484ef72a74545dd2b5bcfc33929c795f3c1ed4 Thomas Bocek <tom@tomp2p.net> 1408965436 +0200	commit: working version
ec484ef72a74545dd2b5bcfc33929c795f3c1ed4 894be0542ab6037287c8dc7be02c5f22284fba85 Thomas Bocek <tom@tomp2p.net> 1408965512 +0200	commit: working version
894be0542ab6037287c8dc7be02c5f22284fba85 dcda7eced34ad833392936b7aa81071b1e035a93 Thomas Bocek <tom@tomp2p.net> 1408965566 +0200	commit: Merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git
dcda7eced34ad833392936b7aa81071b1e035a93 9dfae56a4fe9e574c3355d2d36e7b786b36ee17d Thomas Bocek <tom@tomp2p.net> 1408980779 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
9dfae56a4fe9e574c3355d2d36e7b786b36ee17d 177e6570b416349a1bb448d3188c45b8c189c25f Thomas Bocek <tom@tomp2p.net> 1408980801 +0200	commit: fixed history serialization
177e6570b416349a1bb448d3188c45b8c189c25f 7f2af2ee400d1e687e73bc84ada118e86788f1d9 Thomas Bocek <tom@tomp2p.net> 1409049258 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
7f2af2ee400d1e687e73bc84ada118e86788f1d9 d7d407b3ec8ff65a78ff0bda9ed3b339d2988fa3 Thomas Bocek <tom@tomp2p.net> 1409245737 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
d7d407b3ec8ff65a78ff0bda9ed3b339d2988fa3 989bfa4729ec5356169f39f5e21be41afa69928e Thomas Bocek <tom@tomp2p.net> 1409488503 +0200	commit: added support for unverified transaciotns
989bfa4729ec5356169f39f5e21be41afa69928e 289223f214859dcc845c36a40ade52f1aa49af9f Thomas Bocek <tom@tomp2p.net> 1409491602 +0200	commit: Added type for unconfirmed tx
289223f214859dcc845c36a40ade52f1aa49af9f 4740d580652897c9299c0ccf0526673ef4de7116 Thomas Bocek <tom@tomp2p.net> 1412072429 +0200	merge branch 'master' of https://github.com/MBPS-Project/mbps-shared-ressources.git: Fast-forward
4740d580652897c9299c0ccf0526673ef4de7116 13869528f794f394f6c6101f3ddd1a56c375f3b2 Raphael <r.voellmy@gmail.com> 1426519389 +0100	commit: renamed mbps to coinblesk
13869528f794f394f6c6101f3ddd1a56c375f3b2 ca907535473d3e63a70a29efb5195e3f3184b744 Raphael <r.voellmy@gmail.com> 1436862160 +0200	commit: remove unneeded classes add new transfer objects
ca907535473d3e63a70a29efb5195e3f3184b744 2a1d590cdc3c421515dcd24df3f99dab988b94eb Raphael <r.voellmy@gmail.com> 1437835496 +0200	commit: add signed transaction transfer object, remove target directory from git index
2a1d590cdc3c421515dcd24df3f99dab988b94eb 6dce534513a7c71393b068f7b84693e15b6fe48d Raphael <r.voellmy@gmail.com> 1439886847 +0200	pull: Fast-forward
6dce534513a7c71393b068f7b84693e15b6fe48d 3a3547eaeece6ebb9c10b933c0a303266912f472 Raphael <r.voellmy@gmail.com> 1440162322 +0200	commit: simplified server signature transfer object
3a3547eaeece6ebb9c10b933c0a303266912f472 8c364199614c45dc07c0ba96bcc1f929c1722bb3 Raphael <r.voellmy@gmail.com> 1440237523 +0200	commit: add account number to server signature request transfer object
