Skip to content

Commit 2b3aac6

Browse files
committed
Merge branch '3.4'
Conflicts: CHANGELOG.md
2 parents 55a7814 + 7b36905 commit 2b3aac6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ChangeLog
22
=========
33

4-
4.0.0-alpha2 (2015-??-??)
4+
4.0.0-alpha2 (2015-09-04)
55
-------------------------
66

77
* Updated windows timezone file to support new mexican timezone.
@@ -50,7 +50,7 @@ ChangeLog
5050
and `IntegerValue` to allow PHP 7 compatibility.
5151

5252

53-
3.4.7 (????-??-??)
53+
3.4.7 (2015-09-04)
5454
------------------
5555

5656
* #253: Handle `isInTimeRange` for recurring events that have 0 valid

0 commit comments

Comments
 (0)