diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:21:25 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-05 12:21:25 -0500 |
| commit | b07ae3fe59c336c7880d5af40166a1a2413fede0 (patch) | |
| tree | c2fa37b6bad3d94d5a9f3fe9d8d7be64812bb92e /phpBB/includes/ucp/info/ucp_main.php | |
| parent | 4f947ebb47e4236c4bc3e2474eb49069d67d91e1 (diff) | |
| parent | 0f7cdfe9f416ed8cdc1f4373bac32e28c44b2549 (diff) | |
| download | forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.gz forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.bz2 forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.tar.xz forums-b07ae3fe59c336c7880d5af40166a1a2413fede0.zip | |
Merge PR #1053 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
Conflicts:
phpBB/includes/ucp/ucp_prefs.php
phpBB/styles/prosilver/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/includes/ucp/info/ucp_main.php')
0 files changed, 0 insertions, 0 deletions