Commit Graph

218 Commits

Author SHA1 Message Date
Mathieu Lagace
21111ae622 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!79
2019-10-19 20:38:52 +00:00
Mathieu Lagace
13af227a7d Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!78
2019-10-19 20:32:30 +00:00
Mathieu Lagace
073ad62ccf 3.2.4 2019-10-19 16:30:03 -04:00
Mathieu Lagace
f3ec54db20 Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!77
2019-10-19 20:24:33 +00:00
Mathieu Lagace
fea20bcda9 3.2.4 2019-10-19 16:20:57 -04:00
Mathieu Lagace
44a4035f42 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!76
2019-10-19 20:08:47 +00:00
Mathieu Lagace
f61aa35ac3 Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!75
2019-10-19 19:40:43 +00:00
Mathieu Lagace
7e676ddedd 3.2.4 2019-10-19 15:38:19 -04:00
Mathieu Lagace
f04f93e89b Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!74
2019-10-19 19:19:20 +00:00
Mathieu Lagace
f26631bedf 3.2.4 2019-10-19 15:16:24 -04:00
Mathieu Lagace
799261a7d5 3.2.4 2019-10-19 13:11:42 -04:00
Mathieu Lagace
5c6f2d28bc Merge branch '3.2.4' into 'dev'
MAJ UI Calendar Fix

See merge request TheGamecraft/c-cms!73
2019-10-02 13:34:34 +00:00
Mathieu Lagace
498c80f404 MAJ UI Calendar Fix 2019-10-02 09:32:08 -04:00
Mathieu Lagace
619c335379 Merge branch '3.2.4' into 'dev'
MAJ UI Calendar

See merge request TheGamecraft/c-cms!72
2019-10-02 12:44:25 +00:00
Mathieu Lagace
1c7997c549 MAJ UI Calendar 2019-10-02 08:40:53 -04:00
Mathieu Lagace
faf0c20d7d Merge branch '3.2.4' into 'dev'
3.2.4

See merge request TheGamecraft/c-cms!70
2019-10-02 12:16:14 +00:00
Mathieu Lagace
0166c48daa 3.2.4 2019-09-30 17:06:31 -04:00
Mathieu Lagace
d1ce6ba6da Merge branch '3.2.3' into '3.2.4'
3.2.3

See merge request TheGamecraft/c-cms!69
2019-09-18 11:50:00 +00:00
Mathieu Lagace
2eabeb4205 3.2.4 2019-09-17 21:40:55 -04:00
Mathieu Lagace
ccc947d444 Merge branch '3.2.1' of https://gitlab.com/TheGamecraft/c-cms into 3.2.2 2019-09-14 15:33:56 -04:00
Mathieu Lagace
14cdc8b880 Merge branch '3.2.3' into 'master'
3.2.3

See merge request TheGamecraft/c-cms!68
2019-09-13 20:51:47 +00:00
Mathieu Lagace
b24f0baddb 3.2.3 2019-09-13 16:49:03 -04:00
Mathieu Lagace
0f28be3218 Merge branch '3.2.3' into 'master'
3.2.3

See merge request TheGamecraft/c-cms!67
2019-09-13 20:48:50 +00:00
Mathieu Lagace
9fee30f1ee 3.2.3 2019-09-13 16:46:51 -04:00
Mathieu Lagace
dccc76d7e7 Merge branch '3.2.3' into 'master'
3.2.3

See merge request TheGamecraft/c-cms!66
2019-09-13 20:42:42 +00:00
Mathieu Lagace
5f7894781c 3.2.3 2019-09-13 16:40:43 -04:00
Mathieu Lagace
037b3b4c47 Merge branch 'dev' into 'master'
Dev

See merge request TheGamecraft/c-cms!65
2019-09-13 20:33:08 +00:00
Mathieu Lagace
f517250bbf Merge branch '3.2.3' into 'dev'
3.2.3

See merge request TheGamecraft/c-cms!64
2019-09-13 20:28:28 +00:00
Mathieu Lagace
7dedd9586b 3.2.3 2019-09-13 16:25:36 -04:00
Mathieu Lagace
b7c2b8a632 Perm 2019-09-12 18:21:55 -04:00
Mathieu Lagace
67f49b40e9 Merge remote-tracking branch 'origin/3.2.3' into 3.2.3 2019-09-12 08:02:22 -04:00
Mathieu Lagace
566c5ef0ba Merge remote-tracking branch 'origin/3.2.2' into 3.2.3 2019-09-12 08:02:14 -04:00
Mathieu Lagace
376268aa42 Merge branch '3.2.2' into '3.2.3'
Bug Fix

See merge request TheGamecraft/c-cms!63
2019-09-12 11:58:27 +00:00
Mathieu Lagace
2331beab17 3.2.3 2019-09-12 07:53:18 -04:00
Mathieu Lagace
6e7c5c81e6 Merge branch '3.2.2' into 'dev'
Bug Fix

See merge request TheGamecraft/c-cms!62
2019-09-11 22:56:50 +00:00
Mathieu Lagace
c86e6af390 Merge branch '3.2.1' into 'dev'
3.2.1

See merge request TheGamecraft/c-cms!61
2019-09-11 14:15:52 +00:00
Mathieu Lagace
7f07490bdf 3.2.1 2019-09-11 10:13:29 -04:00
Mathieu Lagace
f4dd3ed742 Merge branch 'dev' into 'master'
3.2.1

See merge request TheGamecraft/c-cms!60
2019-09-11 12:39:39 +00:00
Mathieu Lagace
e78d6c3c12 Merge branch '3.2.1' into 'dev'
3.2.1

See merge request TheGamecraft/c-cms!59
2019-09-11 11:50:58 +00:00
Mathieu Lagace
04dd5ee6b7 Bug Fix 2019-09-11 06:57:45 -04:00
Mathieu Lagace
133f430445 3.2.1 2019-09-08 16:43:34 -04:00
Mathieu Lagace
9a65920265 Merge branch 'dev' into 'master'
Fix 3.2.1c

See merge request TheGamecraft/c-cms!58
2019-09-04 01:33:44 +00:00
Mathieu Lagace
ee6b71534a Merge branch '3.2.1' into 'dev'
3.2.1c

See merge request TheGamecraft/c-cms!57
2019-09-04 01:28:46 +00:00
Mathieu Lagace
0bd86285ca 3.2.1c 2019-09-03 21:26:47 -04:00
Mathieu Lagace
245c357b7a Merge branch 'dev' into 'master'
Fix 3.2.1b

See merge request TheGamecraft/c-cms!56
2019-09-03 21:41:39 +00:00
Mathieu Lagace
96e4fc36d1 Merge branch '3.2.1' into 'dev'
3.2.1b

See merge request TheGamecraft/c-cms!55
2019-09-03 21:37:19 +00:00
Mathieu Lagace
0b5b5575d4 3.2.1b 2019-09-03 17:34:48 -04:00
Mathieu Lagace
3a05ddfb0d Merge branch 'dev' into 'master'
Fix 3.2.1a

See merge request TheGamecraft/c-cms!54
2019-09-03 21:25:39 +00:00
Mathieu Lagace
48ccf671ef Merge branch '3.2.1' into 'dev'
3.2.1

See merge request TheGamecraft/c-cms!53
2019-09-03 21:21:24 +00:00
Mathieu Lagace
06f706b3a8 3.2.1 2019-09-03 17:18:45 -04:00