Merge lp:~hartmut-php/eventum/no-mysql-functions into lp:eventum
Proposed by
Elan Ruusamäe
Status: | Merged |
---|---|
Merge reported by: | Elan Ruusamäe |
Merged at revision: | not available |
Proposed branch: | lp:~hartmut-php/eventum/no-mysql-functions |
Merge into: | lp:eventum |
Diff against target: |
214 lines (+26/-20) (has conflicts) 11 files modified
lib/eventum/class.custom_field.php (+1/-1) lib/eventum/class.draft.php (+1/-1) lib/eventum/class.email_account.php (+1/-1) lib/eventum/class.mail_queue.php (+6/-0) lib/eventum/class.news.php (+1/-1) lib/eventum/class.note.php (+1/-1) lib/eventum/class.notification.php (+1/-1) lib/eventum/class.report.php (+1/-1) lib/eventum/class.search.php (+2/-2) lib/eventum/class.stats.php (+9/-9) lib/eventum/class.support.php (+2/-2) Text conflict in lib/eventum/class.mail_queue.php |
To merge this branch: | bzr merge lp:~hartmut-php/eventum/no-mysql-functions |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Elan Ruusamäe | Pending | ||
Review via email:
|
Description of the change
To post a comment you must log in.
merged in git /github. com/eventum/ eventum/ commit/ 312b0d00d35ac29 1b758b574e967ed fbad6340ed
https:/