diff options
author | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2015-02-05 19:38:43 -0800 |
commit | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (patch) | |
tree | fc60c2d05958c2a458ac72b03e1e7ddffce0c41b /view/pdl | |
parent | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (diff) | |
parent | b948fbaeda84f4358722222b4a2d5555ef10b82e (diff) | |
download | volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.gz volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.tar.bz2 volse-hubzilla-4b348d248975ba07ba9cea62f51eb52d6afb5645.zip |
Merge branch 'master' into tres
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/pdl')
-rw-r--r-- | view/pdl/mod_rate.pdl | 3 | ||||
-rw-r--r-- | view/pdl/mod_ratings.pdl (renamed from view/pdl/mod_prep.pdl) | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/view/pdl/mod_rate.pdl b/view/pdl/mod_rate.pdl new file mode 100644 index 000000000..d8f50ad7a --- /dev/null +++ b/view/pdl/mod_rate.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=vcard][/widget] +[/region] diff --git a/view/pdl/mod_prep.pdl b/view/pdl/mod_ratings.pdl index 3d40386cd..0b6e32283 100644 --- a/view/pdl/mod_prep.pdl +++ b/view/pdl/mod_ratings.pdl @@ -1,5 +1,6 @@ [region=aside] [widget=vcard][/widget] +[widget=rating][/widget] [widget=suggestions][/widget] [widget=findpeople][/widget] [/region] |