diff options
| author | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-16 03:00:45 +0200 |
|---|---|---|
| committer | Eliot Whalan <ewhal@pantsu.cat> | 2016-06-16 03:00:45 +0200 |
| commit | 74f98a50adfbe10dd000a3e4d4c1189baae42d04 (patch) | |
| tree | 534e06da72c7166d09ee408a1032ddd8819b76ef /static/includes/settings.inc.php | |
| parent | e4f3f8668175cb77818783ac21f4e77f132e62c9 (diff) | |
Resolve missed revert conflict
Diffstat (limited to 'static/includes/settings.inc.php')
0 files changed, 0 insertions, 0 deletions