Merge remote-tracking branch 'origin/master' into dbal

This commit is contained in:
Baris Usakli
2013-12-06 15:58:58 -05:00
4 changed files with 4 additions and 8 deletions

View File

@@ -1,5 +1,4 @@
<div class="well">
<div class="well account">
<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
<div class="modal-dialog">

View File

@@ -1,5 +1,4 @@
<div class="well">
<div class="well account">
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">

View File

@@ -1,5 +1,4 @@
<div class="well users">
<div class="well users account">
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">

View File

@@ -1,5 +1,4 @@
<div class="well users">
<div class="well users account">
<div class="account-username-box" data-userslug="{userslug}">
<span class="account-username">