diff options
| author | Guillaume Lacasa <guillaume.lacasa@ucaya.com> | 2013-12-11 12:39:20 +0100 |
|---|---|---|
| committer | Guillaume Lacasa <guillaume.lacasa@ucaya.com> | 2013-12-11 12:39:20 +0100 |
| commit | 0d73b105daca5ccca439d0e04692d773c33d274a (patch) | |
| tree | ad3a1669f9477fc088cd025b254fc39c15127c36 /TwoStepsAuthenticator.TestWebsite/Controllers/HomeController.cs | |
| parent | 73004eb56a904ee68cbc9cbd5e880d9cc8bdfde8 (diff) | |
| parent | 0b4e94d02397bf6dd03c053610873dbdf8535059 (diff) | |
| download | TwoStepsAuthenticator-0d73b105daca5ccca439d0e04692d773c33d274a.zip TwoStepsAuthenticator-0d73b105daca5ccca439d0e04692d773c33d274a.tar.gz TwoStepsAuthenticator-0d73b105daca5ccca439d0e04692d773c33d274a.tar.bz2 | |
Merge https://glacasa.visualstudio.com/DefaultCollection/_git/TwoStepsAuthenticator
Conflicts:
TwoStepsAuthenticator/Base32Encoding.cs
Diffstat (limited to 'TwoStepsAuthenticator.TestWebsite/Controllers/HomeController.cs')
0 files changed, 0 insertions, 0 deletions