diff options
| author | WubTheCaptain <wub@partyvan.eu> | 2015-09-22 05:17:52 +0200 |
|---|---|---|
| committer | WubTheCaptain <wub@partyvan.eu> | 2015-09-22 05:17:52 +0200 |
| commit | abc99d78bca51f17eb6a663a7eb4878a4cdbf711 (patch) | |
| tree | 7b1413deadf5b196fd2b6e780a9229213fda302c /pages/faq.swig | |
| parent | 6c82d36307a6955353c287fb7d3d66327bed1364 (diff) | |
| parent | 59f405e9f376c02f75e122fefdad6b75b5318b80 (diff) | |
Merge branch 'master' into development
GitFlow is considered harmful. There's some ugly history in master
branch which was essentially rewritten in the development branch.
This merges master into development with "ours" strategy, to keep clean
path of pulling from master.
Essentially, the development branch is now the new master.
Diffstat (limited to 'pages/faq.swig')
0 files changed, 0 insertions, 0 deletions