diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-01-13 12:29:26 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-01-13 12:29:26 -0300 |
| commit | 5b07c229c6dd507e910f1086af5706b3710f6127 (patch) | |
| tree | 34ceb42b77867b2d2e3f2e81631c5206327d9ebb /data/resources | |
| parent | 001dfc4d5c994f60504ab626927a9711449ab9c6 (diff) | |
| parent | 40fc60e69841a2f9d0a4ba0f02a54ee06a60b56f (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/4948_fix-scrypt-issue' into develop
Diffstat (limited to 'data/resources')
0 files changed, 0 insertions, 0 deletions