| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-06-02 | Delete merge temp file. | Adam Ierymenko | |
| 2015-04-30 | Merge branch 'adamierymenko-dev' into android-jni | Grant Limberg | |
| Conflicts: .gitignore | |||
 |
index : infinitytier.git | |
| Fork of ZeroTier (mirror of https://github.com/vyos/infinitytier.git) |
| summaryrefslogtreecommitdiff |
path: root/.gitignore.orig