diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-08 10:12:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-08 10:12:52 -0800 |
| commit | b4eb87fa583df1f233d107a2b1ff791216d3b214 (patch) | |
| tree | 41d209a4055d28d02593cb42dbd7a1a8eae0a963 /grc/gui/Connection.py | |
| parent | 782ddbf7c44345dbdcfa042a3bf84b10c8c135f4 (diff) | |
| parent | d01c4cc596ed06b901fef0af927da349135c82f8 (diff) | |
Merge branch 'maint'
Used merge strategy -s ours to skip release commit on maint.
Diffstat (limited to 'grc/gui/Connection.py')
0 files changed, 0 insertions, 0 deletions