diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-02 20:55:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-07-02 20:55:41 -0700 |
| commit | 02b4b34d233131948bedc714c444aec44514839a (patch) | |
| tree | 69be89457950048a34fe726f7706228c85b3089f /grc/gui/Preferences.py | |
| parent | 4419080933fa56edf9deb0dde81e30bc88fd17fd (diff) | |
| parent | 6edd3899211a12cc2b1c2358cb8e53446e0c0191 (diff) | |
Merge branch 'maint'
Used merged strategy -s ours to skip release commit on maint branch.
Diffstat (limited to 'grc/gui/Preferences.py')
0 files changed, 0 insertions, 0 deletions