Skip to content

Commit ef4914f

Browse files
DylanAustin-TheDreamerDylanAustin-TheDreamer
committed
Merge branch 'main' of https://github.com/DylanAustin-TheDreamer/buddhist-uni.github.io into dylan-sass-fixes
2 parents b7c7e51 + 4ff793c commit ef4914f

50 files changed

Lines changed: 93 additions & 55 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_authors/wijesekera.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/awakening-not-metaphor-effects-of_britton-willoughby-b-et-al.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/bodily-maps-of-emotions_nummenmaa-lauri-et-al.md‎

Lines changed: 1 addition & 2 deletions

‎_content/articles/btw-desire-and-duty-on-tibetan-identity_lauer-tina.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/buddhism-in-muslim-indonesia_steenbrink-karel.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/can-meditation-slow-rate-of-cellular_epel-elissa-s-et-al.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/compassion-training-alters-altruism-and_weng-helen-y-et-al.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/displacement-diminishment-and-presence_arensen-lisa.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/distinct-categories-of-emotion_cowen-alan-et-al.md‎

Lines changed: 1 addition & 1 deletion

‎_content/articles/effect-of-compassion-meditation-on_pace-thaddeus-w-w-et-al.md‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)