Commit Graph

6 Commits

Author SHA1 Message Date
Deven Bansod
cbb6e3eda0 Merge branch 'QA_4_5'
Conflicts:
	po/eo.po
	po/li.po
	po/uz@latin.po
2015-12-31 12:01:10 +05:30
Madhura Jayaratne
bfcd37b84f Fix #11710 Unable to add/remove on update CURRENT_TIMESTAMP option while editing a timestamp field
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-12-02 17:16:50 +11:00
Deven Bansod
e2d0d2703a Include with correct filename
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
2015-11-17 03:34:48 +05:30
Deven Bansod
c62672edd0 Merge branch 'QA_4_5'
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	po/cs.po
	po/fi.po
	po/it.po
	po/nb.po
	po/nl.po
	po/sv.po
2015-11-12 23:49:31 +05:30
Madhura Jayaratne
b31248fba4 Fix regression introduced while moving controllers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-04 07:22:56 +11:00
Madhura Jayaratne
a701078e00 Move the controller to appropriate package
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-11-03 13:25:17 +11:00