diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2014-08-21 16:09:37 -0500 |
|---|---|---|
| committer | Ruben Pollan <meskio@sindominio.net> | 2014-08-21 16:09:37 -0500 |
| commit | 597a0aa1ccd125ce83727128c0cddccc9ef29796 (patch) | |
| tree | 4e3f985b170e17baa72e5c265bcfde71dc9d5f96 | |
| parent | 804a0b388a8d0fc4e03ec2c525f277d5eabaae7f (diff) | |
| parent | 2d23d435e3d8b873165f331ec80ce0e18c1325ea (diff) | |
Merge remote-tracking branch 'kali/ignore-trial-temp' into develop
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -20,3 +20,4 @@ local/ share/ MANIFEST twistd.pid +_trial_temp |