diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-02-19 20:34:35 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-02-19 20:34:35 +0100 |
| commit | 8679115552ec65ccfc6cbc1db68414d80e3a081b (patch) | |
| tree | 0d458ead5d254932fa5707ec8ca74cd2a5dd1ecc /src/settings/general | |
| parent | 9221362ceaf695b02b316f88cbf27e1ba96c89db (diff) | |
| parent | 1ef5434572d0289a160589395b8b80cd800bc195 (diff) | |
Merge branch 'master' into frameworks
Diffstat (limited to 'src/settings/general')
0 files changed, 0 insertions, 0 deletions