diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-27 21:01:33 -0500 |
| commit | b624374191f4499ccb2a72daa5fd0aa4e0e66a94 (patch) | |
| tree | 5a5753c0d7242c8667419e33059b3a2870175b90 /.conkeror.mozdev.org | |
| parent | 8ffc4249b8eca31071de95a482ac2a3bf6b7b40e (diff) | |
| parent | 5f7de477be298f158369862c1a3cc80286fc7e32 (diff) | |
Merge remote-tracking branch 'origin/master' into thinkpenguin-par
Diffstat (limited to '.conkeror.mozdev.org')
| l--------- | .conkeror.mozdev.org | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.conkeror.mozdev.org b/.conkeror.mozdev.org index 729efd7..49c36a2 120000 --- a/.conkeror.mozdev.org +++ b/.conkeror.mozdev.org @@ -1 +1 @@ -.mozilla
\ No newline at end of file +.mozilla/
\ No newline at end of file |