tenses

English as a Second Language English Vocabulary, Grammar and Idioms
1

Which is correct:
[color=indigo]

  1. In the period I have known you, you have made only two jokes that have made me laugh.
    [color=blue]2) In the period I have known you, you have made only two jokes that made me laugh.
    [color=red]3) In the period I have known you, you made only two jokes that made me laugh.

Gratefully,
Navi.

2

1 and 2 are both possible.